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,645 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

3889 Commits

Author SHA1 Message Date
Zeger-Jan van de Weg df85a7c004 Submodule Dockerfile templates 2017-04-26 15:57:44 +00:00
Bob Van Landuyt 019b06b9d2 Load a project's CI status in batch from redis 2017-04-26 12:04:22 +00:00
Maxim Rydkin 37c2c4a433 Decrease Cyclomatic Complexity threshold to 16 2017-04-26 10:40:28 +00:00
Sean McGivern 3ff8d8020e Merge branch '20378-natural-sort-issue-numbers' into 'master' 
Change issues sentence to use natural sorting

Closes #20378

See merge request !7110
 2017-04-26 09:40:12 +00:00
Jeff Stubler a78eeefd6e Change issues sentence to use natural sorting 2017-04-25 18:57:08 -05:00
Douwe Maan 9852cae8d7 Merge branch 'mr-diff-size-overflow' into 'master' 
Show correct size when MR diff overflows

Closes #26560

See merge request !10827
 2017-04-25 17:45:24 +00:00
Sean McGivern a0979c05fd Show correct size when MR diff overflows 
The problem is that we often go via a diff object constructed from the diffs
stored in the DB. Those diffs, by definition, don't overflow, so we don't have
access to the 'correct' `real_size` - that is stored on the MR diff object
iself.
 2017-04-25 16:54:10 +01:00
Douwe Maan d7e2ac7293 Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled 2017-04-24 19:27:39 -07:00
Sean McGivern ce559142a6 Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' 
Fix commenting on an existing discussion on an unchanged line that is no longer in the diff

Closes #31339

See merge request !10888
 2017-04-24 17:28:39 +00:00
Rémy Coutable df65e4376e Merge branch '30305-oauth-token-push-code' into 'master' 
Allow OAuth clients to push code

Closes #30305

See merge request !10677
 2017-04-24 16:31:32 +00:00
Douwe Maan 63d38a303b Fix commenting on an existing discussion on an unchanged line that is no longer in the diff 2017-04-24 11:17:15 -05:00
Sean McGivern 7e335d2024 Merge branch 'email-handler-metrics' into 'master' 
Make handler metric params more explicit

See merge request !10854
 2017-04-24 14:51:00 +00:00
Rémy Coutable 499d875652 Merge branch 'workhorse-secret-path' into 'master' 
Make location of gitlab_workhorse_secret configurable

See merge request !10357
 2017-04-24 11:02:25 +00:00
Sean McGivern 0bb31e54d1 Make handler metric params more explicit 2017-04-21 16:11:21 +01:00
Nick Thomas 6647542cd4 Fix Gitlab::Metrics metaprogramming magic 
On initial startup with no rows in the application_settings table, the
metaprogramming call to `if enabled?` attempts to create a row. This triggers
the HTML caching path, which attempts to store metrics.

At this point, not all the methods in `Gitlab::Metrics` have been defined! Move
`current_transaction` to be defined before running the metaprogramming, to
avoid a confusing NoMethodError
 2017-04-21 11:52:28 +01:00
Sean McGivern 38e30516e1 Merge branch 'fix/encoding-issue' into 'master' 
Fix encoding issue exporting a project

Closes #31186

See merge request !10824
 2017-04-21 09:40:48 +00:00
Douwe Maan cc9e92a076 Merge branch 'add-email-receiver-metrics' into 'master' 
Add email receiver metrics

See merge request !10814
 2017-04-20 14:32:12 +00:00
James Lopez 71b6a4ba85 Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING error 2017-04-20 16:10:33 +02:00
Sean McGivern 19970e1dba Store projects in metrics for email replies 2017-04-20 13:19:16 +01:00
Sean McGivern 57edc23385 Add metrics events for incoming emails 
This lets us track how many incoming emails a GitLab instance is processing, by
email type (handler) and by project (where applicable).
 2017-04-20 11:32:10 +01: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
Jakub Jirutka 6cb65c8c34 Make location of gitlab_workhorse_secret configurable 
Hard-coding location of configuration files is very bad practice. This
patch applies the same approach as currently used for
gitlab_shell_secret file.
 2017-04-19 20:04:31 +02: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
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
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
Sean McGivern 380e40fee3 Remove unused user activities code 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
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
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
Timothy Andrew bee780e8fd Allow OAuth clients to push code 
- We currently support fetching code with username = 'oauth2' and
  password = <access_token>.
- Trying to _push_ code with the same credentials fails with an authentication
  error.
- There's no reason this shouldn't be enabled, especially since we allow the
  OAuth client to create deploy keys with push access:

  https://docs.gitlab.com/ce/api/deploy_keys.html#add-deploy-key
 2017-04-13 13:13:22 +00:00