diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-05 13:09:34 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-05 13:09:34 +0000 |
| commit | b2a7faa5a9223811884676bb1004f97fb8a18a54 (patch) | |
| tree | d48eb8943124ccde080a17c3e157e4249abde5f4 /config | |
| parent | 63a1a57024e54ff6aee1f099ca7b431a7bb0e669 (diff) | |
| parent | 0f66a1b4a0f50b0db1adb279ad1c8c1af4a76c8c (diff) | |
| download | gitlab-ce-b2a7faa5a9223811884676bb1004f97fb8a18a54.tar.gz | |
Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into 'master'
Use chronic duration attribute for project build timeout
See merge request gitlab-org/gitlab-ce!17386
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 48ba8ef06f9..0f2ea1c01d1 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -420,7 +420,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end namespace :settings do get :members, to: redirect("%{namespace_id}/%{project_id}/project_members") - resource :ci_cd, only: [:show], controller: 'ci_cd' do + resource :ci_cd, only: [:show, :update], controller: 'ci_cd' do post :reset_cache end resource :integrations, only: [:show] |