diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-07 17:48:05 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-07 17:48:05 +0300 |
| commit | fee26d777cd89aa26f7530cfe116defeb9f2c551 (patch) | |
| tree | d10eb95db0d41b512c4880302032eb3fb1b00b6b /app/views/projects/settings | |
| parent | 15a282387938c896ff7b83cb1bb4fe447b856b2b (diff) | |
| parent | 1a3edcec4363239a4d080bc9af53d9d455dccfb4 (diff) | |
Merge branch 'master' into new-nav-fix-contextual-breadcrumbs
Diffstat (limited to 'app/views/projects/settings')
| -rw-r--r-- | app/views/projects/settings/_head.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/views/projects/settings/_head.html.haml b/app/views/projects/settings/_head.html.haml index b5773acb5a4..15ba09b10ba 100644 --- a/app/views/projects/settings/_head.html.haml +++ b/app/views/projects/settings/_head.html.haml @@ -9,10 +9,6 @@ = link_to edit_project_path(@project), title: 'General' do %span General - = nav_link(controller: :members) do - = link_to project_settings_members_path(@project), title: 'Members' do - %span - Members - if can_edit = nav_link(controller: [:integrations, :services, :hooks, :hook_logs]) do = link_to project_settings_integrations_path(@project), title: 'Integrations' do diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 712799dbadf..8ca15861025 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -8,6 +8,6 @@ = render "projects/settings/head" = render 'projects/runners/index' -= render 'projects/variables/index' += render 'ci/variables/index' = render 'projects/triggers/index' = render 'projects/pipelines_settings/show' |