root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
50,250 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

7879 Commits

Author SHA1 Message Date
Sean McGivern 08b2e7cd8f Merge branch 'plantuml-filter-after-highlight' into 'master' 
Fix PlantUML integration in GFM

Closes #30557

See merge request !10651
 2017-04-20 07:06:05 +00:00
Douwe Maan 3509534a03 Use constants in Gitlab::MarkupHelper 2017-04-20 00:39:29 +00:00
Douwe Maan d170133bde Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
Robert Speicher 93e23a5d71 Merge branch 'query-users-by-extern-uid' into 'master' 
Implement search by extern_uid in Users API

See merge request !10509
 2017-04-19 19:50:38 +00:00
Adam Niedzielski 0945dc4179 Fix PlantUML integration in GFM 
Fixes #30557
Use "lang" attribute instead of "class" in PlantumlFilter.
 2017-04-19 17:54:58 +02:00
Sean McGivern d8ac7575b9 Merge branch 'issuable-state-only-notes-and-description' into 'master' 
Display issuable state only in notes and issuable description

Closes #30964

See merge request !10789
 2017-04-19 15:51:55 +00:00
Sean McGivern 40a972057d Merge branch 'usage-ping-port' into 'master' 
Usage ping port

Closes #27750

See merge request !10481
 2017-04-19 14:48:31 +00:00
Adam Niedzielski de71a46594 Display issuable state only in notes and issuable description 
Closes #30964
 2017-04-19 16:38:46 +02:00
Grzegorz Bizon f6a11d00a8 Fix duplicated container repository names 2017-04-18 22:20:47 +02:00
Robin Bobbitt ddf7e6ae78 Implement search by extern_uid in Users API 2017-04-18 14:55:32 -04:00
Robert Speicher a389ffe530 Merge branch 'fix/improve-gitaly-unsupported-address-error' into 'master' 
Improve gitaly_address error message

Closes gitaly#174

See merge request !10532
 2017-04-18 16:58:42 +00:00
Filipa Lacerda b67bb566b3 Improves support for long build traces: 2017-04-18 12:27:10 +00:00
Lin Jen-Shin fb60c6187d Use &. because rubocop. Seriously I don't think this makes sense 2017-04-18 17:33:17 +08:00
Lin Jen-Shin b07da07c82 Just enforce the output encoding for Ansi2html 
Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/27545/
 2017-04-18 17:12:06 +08:00
Robert Speicher 2b934a7f43 Merge branch 'dm-git-blob-sizes' into 'master' 
Normalize sizes in Gitlab::Git::Blob

See merge request !10742
 2017-04-18 01:47:27 +00:00
Douglas Barbosa Alexandre bf0717802f Does not remove the GitHub remote when importing from GitHub 2017-04-18 00:22:33 +00:00
Douwe Maan d40970bf5e Normalize sizes in Gitlab::Git::Blob 2017-04-17 13:44:31 -05:00
Lin Jen-Shin 9350b9064c Set the encoding in c'tor and explain why it's fine 2017-04-17 17:52:15 +08:00
Lin Jen-Shin e7d3fe44f6 Only set the encoding before passing to Ansi2html 2017-04-17 17:10:41 +08:00
Lin Jen-Shin dac23fa233 Don't try to read if there's no trace 2017-04-17 16:29:47 +08:00
Lin Jen-Shin c26b126502 Make sure @stream.each_line would tag Encoding.default_external 2017-04-17 15:53:09 +08:00
Lin Jen-Shin ee3b0c3a9a Make sure we're giving Encoding.default_external 2017-04-17 14:30:42 +08:00
Stan Hu e89d4741d3 Fix regression in rendering Markdown references that do not exist 
Closes #30972
 2017-04-15 07:26:32 -07:00
Sean McGivern 380e40fee3 Remove unused user activities code 2017-04-14 15:20:55 +02:00
Rémy Coutable 814212621f Expose `last_activity_on` in the User API 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-04-14 15:20:55 +02:00
Rémy Coutable cfe19b795e Add a new Gitlab::UserActivities class to track user activities 
This new class uses a Redis Hash instead of a Sorted Set.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-04-14 15:20:55 +02:00
Sean McGivern 91ac0e038a Port 'Add user activities API' to CE 
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
 2017-04-14 15:20:55 +02:00
James Lopez 3cb84e06b7 Remove user activities table and use redis instead of PG for recording activities 
Refactored specs and added a post deployment migration to remove the activity users table.
 2017-04-14 15:20:55 +02:00
James Lopez 2951a8543e Add user activity service and spec. Also added relevant - NOT offline - migration 
It uses a user activity table instead of a column in users.
Tested with mySQL and postgreSQL
 2017-04-14 15:20:55 +02:00
Sean McGivern b61199ce0c Add prometheus services to usage ping 2017-04-14 15:20:55 +02:00
Sean McGivern 092258e924 Add edition to usage ping 2017-04-14 15:20:55 +02:00
Robert Speicher e21ed5fe77 Add Upload count to usage data 2017-04-14 15:20:55 +02:00
Stan Hu f30a46b401 Used named parameter for refreshing usage data 2017-04-14 15:20:55 +02:00
Stan Hu bca368990a Cache the last usage data to avoid unicorn timeouts 2017-04-14 15:20:55 +02:00
Sean McGivern c53afeda0c Port 'Add uuid to usage ping' to CE 
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1521
 2017-04-14 15:20:55 +02:00
Z.J. van de Weg f5b42881c8 Track Mattermost usage 2017-04-14 15:20:55 +02:00
Ruben Davila f41b693fc7 Remove pushes count from usage ping payload 
This query is constantly generating timeout errors on large installations and we don't
have a simple solution for now and also we don't think having this counter is
really critical.
 2017-04-14 15:20:55 +02:00
Sean McGivern 0483019e98 Port 'Add more usage data to EE ping' to CE 
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/735
 2017-04-14 15:20:55 +02:00
Rémy Coutable 819b715357 Merge branch '30349-create-users-build-service' into 'master' 
Implement Users::BuildService

Closes #30349

See merge request !10675
 2017-04-14 08:51:54 +00:00
Rémy Coutable e33606556f Merge branch 'branch-versions' into 'master' 
Expand components version specification format to allow branches

Closes gitaly#183

See merge request !10610
 2017-04-14 08:29:47 +00:00
Alejandro Rodríguez e61325ff43 Expand components version specification format to allow branches 
Currently we specify versions for Gitlab-Shell, Workhorse and Gitaly
using version strings, to which we prepend 'v' and assume are tags.
These changes allow branches or tags with other name formats to be
specified by prepending '=' to the version string (á la govendor).

We also simplify the process to reset to the given version (now a
branch or tag): Right now there's a check to supposedly try to avoid
fetching from the remote the version if it already exist locally. But
the previous logic already clones if the directory doesn't exist or
fetches if it does, so this check is pointless. We can safely assume the
version exists once we get to the reset stage.
 2017-04-13 17:32:00 -03:00
Robert Speicher 7d7dfee48b Merge branch 'fix-appending-state-to-issuable-references' into 'master' 
Fix appending state to issuable references

Closes #30874

See merge request !10683
 2017-04-13 17:25:33 +00:00
Kamil Trzciński 7761afe091 Merge branch 'fix-trace-seeking-readline' into 'master' 
After Trace#limit, we seek to the next line in case

Closes #30796

See merge request !10681
 2017-04-13 16:58:09 +00:00
Adam Niedzielski 551d0a3c03 Fix appending state to issuable references 
Closes #30874.
Ignore nodes with no children.
Append directly to the node instead of the last child of the node
to avoid inheriting formatting from the last child
 2017-04-13 17:09:30 +02:00
Lin Jen-Shin b07b8a5f3e Don't seek at all if the log is small anyway 
then it's fine to skip the first line because
it won't be very noticeable
 2017-04-13 22:07:37 +08:00
Lin Jen-Shin faa5dffbcc After Trace#limit, we seek to the next line in case 
of breaking ANSI sequence or Unicode
 2017-04-13 21:44:26 +08:00
geoandri defbff482d Implement Users::BuildService 2017-04-13 13:02:59 +03:00
Grzegorz Bizon b5b6c7b175 Sanitize container repository path in model class 2017-04-13 11:54:02 +02:00
Grzegorz Bizon 259108ada3 Fix registry for projects with uppercases in path 2017-04-13 09:20:42 +02:00
Grzegorz Bizon 37ab389139 Revert "Fix registry for projects with uppercases in path" 
This reverts commit 22726942fe.
 2017-04-13 09:18:46 +02:00