diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-07 15:57:45 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-07 15:57:45 +0000 |
| commit | 82ea46a7077786382aa9e6871a8c350df66f1ba2 (patch) | |
| tree | 063fc58c5fb08ef403685b95d5d14a73ba63edfd /lib/api/helpers | |
| parent | 42725ea96c7c2804d8a08130de529aceb87129d1 (diff) | |
| parent | d4bd245acb6340265211ec0d18e5967c64b8b8cb (diff) | |
| download | gitlab-ce-82ea46a7077786382aa9e6871a8c350df66f1ba2.tar.gz | |
Merge branch 'gitaly-git-mandatory' into 'master'
Make git push mandatory
See merge request gitlab-org/gitlab-ce!17565
Diffstat (limited to 'lib/api/helpers')
| -rw-r--r-- | lib/api/helpers/internal_helpers.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb index cd59da6fc70..4b564cfdef2 100644 --- a/lib/api/helpers/internal_helpers.rb +++ b/lib/api/helpers/internal_helpers.rb @@ -111,13 +111,6 @@ module API def gitaly_payload(action) return unless %w[git-receive-pack git-upload-pack].include?(action) - if action == 'git-receive-pack' - return unless Gitlab::GitalyClient.feature_enabled?( - :ssh_receive_pack, - status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT - ) - end - { repository: repository.gitaly_repository, address: Gitlab::GitalyClient.address(project.repository_storage), |