diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-02-07 09:37:48 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-02-07 09:37:48 +0000 |
| commit | 1bbc99f1c83b29f3ec8626ecebe773e7a46b1952 (patch) | |
| tree | 6be3eb0ee17f9af3d992280fb9cb4de2a60a6f37 /config | |
| parent | 412ab17d3f2033c6cc602c79be56476d186f124d (diff) | |
| parent | 1e9280a9d25b97b0632c00bda68e7032c13037c5 (diff) | |
| download | gitlab-ce-1bbc99f1c83b29f3ec8626ecebe773e7a46b1952.tar.gz | |
Merge branch '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pages' into 'master'
Merge Triggers, Runners, Variables and Pipelines to a single option called "CI/CD Pipelines"
Closes #26165
See merge request !8430
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index c24893f4cd5..2ac98cf3842 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -315,6 +315,7 @@ constraints(ProjectUrlConstrainer.new) do end namespace :settings do resource :members, only: [:show] + resource :ci_cd, only: [:show], controller: 'ci_cd' resource :integrations, only: [:show] end |