0db5f576fe
Only require sidekiq-limit_fetch when enabled in settings
...
This gem allows Sidekiq jobs to be throttled. Unfortunately, it has a
side-effect: when we haven't enabled job throttling, it will still hit Redis a
lot (and miss, because nothing is configured).
As this setting already required a restart, ensure that the library is only
required when it's enabled.
2017-08-21 12:56:22 +01:00
e4cf164a9f
Update prometheus mmap client library to fix performance issues when rendering many metrics.
2017-08-18 20:59:38 +02:00
aaa887feba
Client Implementation: RefService::RefExists
2017-08-18 09:43:58 +01:00
91d3e6d901
Merge branch 'ee-2628-backport-to-ce' into 'master'
...
Backports EE mirror stuck handling feature…
See merge request !13627
2017-08-17 13:53:39 +00:00
f865b1b459
Backports EE mirror stuck handling feature ( https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628 ) to CE
2017-08-17 13:38:05 +01:00
dc8e1676cd
Upgrade grape to 1.0
...
Main feature was the deprication of the Hashie stuff, so the access by
calling keys as method is gone now.
2017-08-16 22:06:31 +02:00
90a07deb79
Use charlock_holmes 0.7.5
2017-08-16 16:25:00 +02:00
bd36637bdb
Merge branch '35804-document-table-based-tests' into 'master'
...
Use rspec-parameterized for table-based tests
Closes #35804
See merge request !13469
2017-08-14 18:26:53 +00:00
c1f9403e45
Use Prev/Next pagination for exploring projects
...
This changes the pagination of the "Explore" pages so they use a simpler
pagination system that only shows "Prev" and "Next" buttons. This
removes the need for getting the total number of rows to display, a
process that can easily take up to 2 seconds when browsing through a
large list of projects.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27390
2017-08-14 13:53:42 +02:00
f8fa7a050e
Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'
...
Migrate force push check to Gitaly
See merge request !13406
2017-08-11 20:43:25 +00:00
daa0137b41
Migrate force push check to Gitaly
2017-08-11 19:42:17 +02:00
caa498fd31
Use rspec-parameterized for table-based tests
2017-08-11 12:57:06 +01:00
6debb55690
Bumps omniauth-ldap gem version to 2.0.4
2017-08-11 11:52:23 +01:00
0a3f4dfc82
Don't require stackprof in Gemfile
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09 10:10:33 +02:00
9770c57fab
Re-enable SqlInjection and CommandInjection
2017-08-08 10:50:54 -04:00
6085ce1352
Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Repository#size to Gitaly
Closes gitaly#437
See merge request !13259
2017-08-07 21:29:32 +00:00
da5262f4e6
Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
2017-08-07 19:17:11 +01:00
c4f55ce32d
Migrate Gitlab::Git::Repository#size to Gitaly
...
Closes gitaly#437
2017-08-07 18:53:32 +02:00
bca5747d98
Upgrade haml_lint Gem to 0.26.0
2017-08-07 09:08:15 +00:00
7e45159f0d
Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'
...
Migrate blame loading to Gitaly
Closes gitaly#421
See merge request !13155
2017-08-04 15:40:19 +00:00
e18aef5f11
Bump rspec to 3.6.0
2017-08-03 16:38:29 -04:00
03440eed20
Migrate blame loading to Gitaly
...
Closes gitaly#421
2017-08-03 19:20:46 +02:00
215e0911e5
Migrate Gitlab::Git::Repository#count_commits to Gitaly
...
Closes gitaly#415
2017-08-02 00:33:04 +02:00
618c3e7d2a
Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1
2017-08-01 09:05:25 +09:00
cd5ae5cb2b
Migrate Repository#tags to Gitaly
...
Closes gitaly#411
2017-07-27 20:07:40 +02:00
98619a49c8
Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'
...
Fix prometheus client pid reuse bug
See merge request !13130
2017-07-27 15:47:01 +00:00
a01eabc19f
update rugged
...
the rugged versions up to 0.26.0b3 had a bug concerning the signature
extraction. The extracted signature was not always the same, probably
due to a buffer (overflow) issue in libgit.
see https://github.com/libgit2/rugged/issues/608
2017-07-27 15:43:36 +02:00
817d9558fe
Prototype key verification
2017-07-27 15:40:40 +02:00
3265ac4f39
Update prometheus client gem to fix problems with PID handling following
...
unicorn forking new workers.
2017-07-27 14:40:36 +02:00
d29598e691
Merge remote-tracking branch 'dev/master'
...
# Conflicts:
# Gemfile
# Gemfile.lock
2017-07-26 14:47:50 +02:00
6f5f805924
Add net-ldap explicitly since we use it directly
...
And this has already been done on EE, so it’ll match now.
2017-07-26 02:43:41 -07:00
7f92a36a36
Fix plain LDAP (no encryption)
2017-07-26 02:43:40 -07:00
8ab29d569e
Upgrade omniauth-ldap gem (and some dependencies)
...
Most notably, the net-ldap gem.
2017-07-26 02:43:32 -07:00
b0e30e8608
Merge branch 'bump-omniauth-ldap-gem-version' into 'master'
...
Bumps Gitlab Omniauth LDAP version
See merge request !13059
2017-07-26 08:19:32 +00:00
9d1b9d8972
Merge branch 'upgrade_re2' into 'master'
...
Upgrade re2 to support seperate CXX and CC passing
See merge request !13064
2017-07-25 15:50:22 +00:00
a872c3e886
Bumps Gitlab Omniauth LDAP version
2017-07-25 12:57:43 +01:00
33dc5171e5
Resolve "More RESTful API: include resource URLs in responses"
2017-07-25 09:35:45 +00:00
e43bda0ebb
Merge branch 'dz-update-shoulda' into 'master'
...
Update shoulda-matchers gem to 3.1.2
See merge request !13040
2017-07-25 08:08:26 +00:00
2f0a4243d5
Upgrade re2 to support seperate CXX and CC passing
2017-07-25 08:29:04 +02:00
8f0eef8b00
Update shoulda-matchers gem to 3.1.2
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-07-24 14:19:09 +03:00
61f948baed
Upgrade the re2 gem to 1.1.0
2017-07-24 11:03:37 +01:00
1ce523c133
Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Commit.find_all to Gitaly
Closes gitaly#396
See merge request !12934
2017-07-21 14:28:48 +00:00
c2437be50c
Merge branch 'dz-update-grape' into 'master'
...
Update grape gem
See merge request !12992
2017-07-21 11:30:04 +00:00
b043100b65
Migrate Gitlab::Git::Commit.find_all to Gitaly
...
Closes gitaly#396
2017-07-20 22:03:55 +02:00
ca80d589a6
Merge branch 'feature/send-diff-limits-to-gitaly' into 'master'
...
Migrate DiffCollection limiting logic to Gitaly
See merge request !12867
2017-07-20 14:31:06 +00:00
6b8ad689da
Update grape gem
...
New version of the gem returns 200 status code on delete with content
instead of 204 so we explicitly set status code to keep existing
behavior
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-07-20 16:33:18 +03:00
ba60d4f6e4
Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'
...
24570 use re2 for user supplied regexp 9 3
See merge request !2129
2017-07-19 22:28:41 -05:00
ef2b81adb4
Migrate DiffCollection limiting logic to Gitaly
2017-07-19 18:05:22 +02:00
0579a89fb9
Merge branch 'authentiq-updates' into 'master'
...
Added authentiq provider to tests and updated documentation, gem and config file.
See merge request !12952
2017-07-19 12:16:58 +00:00
2c3d52161a
Update Prometheus gem to version that explicitly calls `munmap`
2017-07-19 08:54:39 +00:00
Sean McGivern
Pawel Chojnacki
Andrew Newdigate
Douwe Maan
Tiago Botelho
Zeger-Jan van de Weg
Jacob Vosmaer
Robert Speicher
Yorick Peterse
Ahmad Sherif
Nick Thomas
Rémy Coutable
Brian Neel
Winnie Hellmann
Robert Speicher
Takuya Noguchi
Alexis Reigel
Kevin O'Connor
Douwe Maan
Michael Kozono
Sean McGivern
Oswaldo Ferreira
Frank Groeneveld
Dmitriy Zaporozhets