diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-07-19 23:26:13 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-07-19 23:26:13 +0200 |
| commit | 4a74798a7ba16fec37f634d0eaf52b838213e090 (patch) | |
| tree | e92a68f1b516a118d01f1e9cb61d90ccb86a3f80 /app/views | |
| parent | 22be5aed1d6db526bd945f9492b806c29969676d (diff) | |
| download | gitlab-ce-4a74798a7ba16fec37f634d0eaf52b838213e090.tar.gz | |
Move Pipelines settings under `gitlab.com/gitlab-org/gitlab-ce/pipelines/settings`
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/nav/_project_settings.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/pipelines/settings.html.haml (renamed from app/views/projects/builds/settings.html.haml) | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml index 1522fd2f9fb..ca7b502eb5a 100644 --- a/app/views/layouts/nav/_project_settings.html.haml +++ b/app/views/layouts/nav/_project_settings.html.haml @@ -39,7 +39,7 @@ = link_to namespace_project_triggers_path(@project.namespace, @project), title: 'Triggers' do %span Triggers - = nav_link(controller: :builds) do - = link_to settings_namespace_project_builds_path(@project.namespace, @project), title: 'CI/CD Pipelines' do + = nav_link(controller: :pipelines) do + = link_to settings_namespace_project_pipelines_path(@project.namespace, @project), title: 'CI/CD Pipelines' do %span CI/CD Pipelines diff --git a/app/views/projects/builds/settings.html.haml b/app/views/projects/pipelines/settings.html.haml index 820fb74fd51..8c90defc2be 100644 --- a/app/views/projects/builds/settings.html.haml +++ b/app/views/projects/pipelines/settings.html.haml @@ -7,7 +7,7 @@ .col-lg-9 %h5.prepend-top-0 Pipelines - = form_for [@project.namespace.becomes(Namespace), @project], remote: true, authenticity_token: true do |f| + = form_for @project, url: settings_namespace_project_pipelines_path(@project.namespace.becomes(Namespace), @project), remote: true, authenticity_token: true do |f| %fieldset.builds-feature - unless @repository.gitlab_ci_yml .form-group |