diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-11 10:01:13 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-11 10:01:13 +0000 |
| commit | 7ad8704c24e54ba08db204131843cd9eaeaed7df (patch) | |
| tree | ae0546e271bb65389cab8e64c081a891e1029fe9 /lib/gitlab/gitaly_client.rb | |
| parent | 37450e5178ce35e35bef0bfa7ec564c18f626177 (diff) | |
| parent | fb47f2a7459f4c413f3fe496bcdb1b40d81d73a4 (diff) | |
| download | gitlab-ce-7ad8704c24e54ba08db204131843cd9eaeaed7df.tar.gz | |
Merge branch 'master' into 40468-empty-states
* master: (76 commits)
Fix image view mode
Remove the need for destroy and add a comment in the spec
Use build instead of create in importer spec
Simplify normalizing of paths
Fix failing importer test case on MySQL due to missing trailing slash in root path
Fix gitlab:import:repos Rake task moving repositories into the wrong location
Allow git pull/push on project redirects
Resolve "Include asset_sync gem"
Use prefix for TableOfContents filter hrefs
Resolve "No feedback when checking on checklist if potential spam was detected"
Fix Rubocop
Fix N+1 query when displaying events
Add Chain::Command specs
Fix a bug of before_sha being inproperly evaluated to `checkout_sha`
Implement and use Gitlab::Ci::Pipeline::Chain::Command
Fix invalid pipeline build chain tag evaluation
Add docs explaining why you get signed out with "Remember me"
Move the circuitbreaker check out in a separate process
Migrate Git::Repository#fsck to Gitaly
Fix new personal access token showing up in a flash message
...
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 1fe938a39a8..b753ac46291 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -27,7 +27,7 @@ module Gitlab end SERVER_VERSION_FILE = 'GITALY_SERVER_VERSION'.freeze - MAXIMUM_GITALY_CALLS = 30 + MAXIMUM_GITALY_CALLS = 35 CLIENT_NAME = (Sidekiq.server? ? 'gitlab-sidekiq' : 'gitlab-web').freeze MUTEX = Mutex.new |