diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-07 15:48:05 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-07 15:48:05 +0100 |
| commit | fee26d777cd89aa26f7530cfe116defeb9f2c551 (patch) | |
| tree | d10eb95db0d41b512c4880302032eb3fb1b00b6b /app/views/groups | |
| parent | 15a282387938c896ff7b83cb1bb4fe447b856b2b (diff) | |
| parent | 1a3edcec4363239a4d080bc9af53d9d455dccfb4 (diff) | |
| download | gitlab-ce-fee26d777cd89aa26f7530cfe116defeb9f2c551.tar.gz | |
Merge branch 'master' into new-nav-fix-contextual-breadcrumbs
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/_settings_head.html.haml | 5 | ||||
| -rw-r--r-- | app/views/groups/settings/ci_cd/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/groups/variables/show.html.haml | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/views/groups/_settings_head.html.haml b/app/views/groups/_settings_head.html.haml index 2454e7355a7..623d233a46a 100644 --- a/app/views/groups/_settings_head.html.haml +++ b/app/views/groups/_settings_head.html.haml @@ -12,3 +12,8 @@ = link_to projects_group_path(@group), title: 'Projects' do %span Projects + + = nav_link(controller: :ci_cd) do + = link_to group_settings_ci_cd_path(@group), title: 'Pipelines' do + %span + Pipelines diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml new file mode 100644 index 00000000000..bf36baf48ab --- /dev/null +++ b/app/views/groups/settings/ci_cd/show.html.haml @@ -0,0 +1,4 @@ +- page_title "Pipelines" += render "groups/settings_head" + += render 'ci/variables/index' diff --git a/app/views/groups/variables/show.html.haml b/app/views/groups/variables/show.html.haml new file mode 100644 index 00000000000..df533952b76 --- /dev/null +++ b/app/views/groups/variables/show.html.haml @@ -0,0 +1 @@ += render 'ci/variables/show' |