diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-10-05 10:13:06 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-10-05 10:13:06 +0900 |
| commit | af2c51d7ca73e16cdb9a11fff6d097116c7c5324 (patch) | |
| tree | cd7f07f36e09a357902a262cbb932f25d254a16c /config/routes/project.rb | |
| parent | acfe7ec65c75f65f2f87bf3e8598c1725c9150f4 (diff) | |
| parent | f71c497f5da791a35876206255e342a9bb5e49c5 (diff) | |
| download | gitlab-ce-af2c51d7ca73e16cdb9a11fff6d097116c7c5324.tar.gz | |
Merge branch 'master-ce' into scheduled-manual-jobs
Diffstat (limited to 'config/routes/project.rb')
| -rw-r--r-- | config/routes/project.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 04a270c5cc9..356a509da75 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -366,7 +366,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get :discussions, format: :json end collection do - post :bulk_update + post :bulk_update end end @@ -438,6 +438,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get :members, to: redirect("%{namespace_id}/%{project_id}/project_members") resource :ci_cd, only: [:show, :update], controller: 'ci_cd' do post :reset_cache + put :reset_registration_token end resource :integrations, only: [:show] resource :repository, only: [:show], controller: :repository do |