diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 21:08:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 21:08:17 +0300 |
commit | 219eead23f9feb5da9ec378c451d773aea2dfe61 (patch) | |
tree | eec14421a05ca8eb79f3cc782abe99532bb6070c /config | |
parent | 7c38405be9e79099f399aa429503ea7b463bbf5a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/gitlab.yml.example | 2 | ||||
-rw-r--r-- | config/routes/import.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 330e5109ed4..ce9df6b6024 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1226,6 +1226,8 @@ test: gitaly: client_path: tmp/tests/gitaly token: secret + workhorse: + secret_file: tmp/tests/gitlab_workhorse_secret backup: path: tmp/tests/backups pseudonymizer: diff --git a/config/routes/import.rb b/config/routes/import.rb index 9fe2688de1e..57a1fab48e9 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -60,6 +60,7 @@ namespace :import do resource :gitlab_project, only: [:create, :new] do post :create + post :authorize end resource :manifest, only: [:create, :new], controller: :manifest do |