diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-03-07 18:37:14 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-03-07 23:26:57 -0600 |
| commit | ceec35043777b79bb13db66a78338d7abc785e93 (patch) | |
| tree | 88655cb6cfc0ef6d2e931678391ab45e4f61b33b | |
| parent | 4739e4a7f0718257b1f61173a4a64cd885c9fd36 (diff) | |
| download | gitlab-ce-ceec35043777b79bb13db66a78338d7abc785e93.tar.gz | |
Fixed changelog and a haml condition project.html.haml
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 16 | ||||
| -rw-r--r-- | changelogs/unreleased/settings-tab.yml | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 0697ba5b6fb..299dace3406 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -57,14 +57,14 @@ - if project_nav_tab? :settings = nav_link(path: %w[projects#edit members#show integrations#show repository#show ci_cd#show pages#show]) do - - if can_edit - = link_to edit_project_path(@project), title: 'Settings', class: 'shortcuts-tree' do - %span - Settings - - else - = link_to edit_project_path(@project), title: 'Settings', class: 'shortcuts-tree' do - %span - Settings + = link_to edit_project_path(@project), title: 'Settings', class: 'shortcuts-tree' do + %span + Settings + - else + = nav_link(path: %w[members#show]) do + = link_to namespace_project_settings_members_path(@project.namespace, @project), title: 'Settings', class: 'shortcuts-tree' do + %span + Settings -# Shortcut to Project > Activity %li.hidden diff --git a/changelogs/unreleased/settings-tab.yml b/changelogs/unreleased/settings-tab.yml index ec0cf24796b..69990c9a917 100644 --- a/changelogs/unreleased/settings-tab.yml +++ b/changelogs/unreleased/settings-tab.yml @@ -1,4 +1,4 @@ --- -title: Removed the settings gear button inside the Project to a tab +title: Moved project settings from the gear drop-down menu to a tab merge_request: 9786 author: |