diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-30 08:49:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-30 08:49:46 +0000 |
| commit | 34431d8ecb1c3d3082c3e391db70b33ca7dbf056 (patch) | |
| tree | 438419a047e51013d916e8dce540ab97f407595f /app/views/layouts | |
| parent | 2e8a3e3996f47a5b436bce9a6bbb61ca0a351cab (diff) | |
| parent | 87240e989ba913bad787d8bc81da1a9b87f1da53 (diff) | |
| download | gitlab-ce-34431d8ecb1c3d3082c3e391db70b33ca7dbf056.tar.gz | |
Merge branch 'move-ci-settings' into 'master'
Move CI project settings page to CE project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Part of #2594
See merge request !1465
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/ci/_nav_project.html.haml | 6 | ||||
| -rw-r--r-- | app/views/layouts/nav/_project_settings.html.haml | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/views/layouts/ci/_nav_project.html.haml b/app/views/layouts/ci/_nav_project.html.haml index 2d3cc3cf983..3a2741367c1 100644 --- a/app/views/layouts/ci/_nav_project.html.haml +++ b/app/views/layouts/ci/_nav_project.html.haml @@ -26,9 +26,3 @@ = icon('book fw') %span Events - %li.separate-item - = nav_link path: 'projects#edit' do - = link_to edit_ci_project_path(@project) do - = icon('cogs fw') - %span - Settings diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml index 28efb035d09..26cccb48f68 100644 --- a/app/views/layouts/nav/_project_settings.html.haml +++ b/app/views/layouts/nav/_project_settings.html.haml @@ -50,3 +50,8 @@ = icon('retweet fw') %span Triggers + = nav_link path: 'ci_settings#edit' do + = link_to edit_namespace_project_ci_settings_path(@project.namespace, @project) do + = icon('building fw') + %span + CI Settings |