diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-11 18:05:25 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-11 18:05:25 +0000 |
| commit | bdcd37610a8a5eec13b0bb3b2d86f9032a7c4083 (patch) | |
| tree | 10e2606b38a70a44f0b4785ed4d09d30c6709140 | |
| parent | cc7353523bc1d19054769d7a0a61b0cb7f6ce4e3 (diff) | |
| parent | 0ce7c29fb78ac0237f4c574513cd8b322bd39f1a (diff) | |
| download | gitlab-ce-bdcd37610a8a5eec13b0bb3b2d86f9032a7c4083.tar.gz | |
Merge branch '55191-update-workhorse' into 'master'
Update GitLab Workhorse to v8.0.0
Closes #55191
See merge request gitlab-org/gitlab-ce!23740
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/55191-update-workhorse.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/workhorse.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index 93c8ddab9fe..ae9a76b9249 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -7.6.0 +8.0.0 diff --git a/changelogs/unreleased/55191-update-workhorse.yml b/changelogs/unreleased/55191-update-workhorse.yml new file mode 100644 index 00000000000..d16518e673a --- /dev/null +++ b/changelogs/unreleased/55191-update-workhorse.yml @@ -0,0 +1,5 @@ +--- +title: Update GitLab Workhorse to v8.0.0 +merge_request: 23740 +author: +type: other diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index da22ea9cf5c..265f6213a99 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -31,7 +31,6 @@ module Gitlab GL_USERNAME: user&.username, ShowAllRefs: show_all_refs, Repository: repository.gitaly_repository.to_h, - RepoPath: 'ignored but not allowed to be empty in gitlab-workhorse', GitConfigOptions: [], GitalyServer: { address: Gitlab::GitalyClient.address(project.repository_storage), diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb index b3f55a2e1bd..7213eee5675 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -246,7 +246,6 @@ describe Gitlab::Workhorse do GL_ID: "user-#{user.id}", GL_USERNAME: user.username, GL_REPOSITORY: "project-#{project.id}", - RepoPath: repo_path, ShowAllRefs: false } end @@ -261,7 +260,6 @@ describe Gitlab::Workhorse do GL_ID: "user-#{user.id}", GL_USERNAME: user.username, GL_REPOSITORY: "wiki-#{project.id}", - RepoPath: repo_path, ShowAllRefs: false } end |