diff options
| author | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2016-10-06 10:37:01 +0200 |
|---|---|---|
| committer | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2016-10-06 10:37:01 +0200 |
| commit | f13bc475ae7126ed91f4a5c80f72a9db1cabb65a (patch) | |
| tree | 3dba08769ce14e37e382cdaf1aedc1c5f558b8c7 | |
| parent | 1ac47d36f7d8d274aef0b861afdf026068b88c32 (diff) | |
| download | gitlab-ce-change-project-settings-icon.tar.gz | |
changed additional places where cog was used for settings like group settings and admin settings, changed changelog to reflectchange-project-settings-icon
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_admin_settings.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_group_settings.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index cf844a922f8..9e6c0e48e1c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -74,7 +74,7 @@ v 8.12.4 - Fix failed project deletion when feature visibility set to private. !6688 - Prevent claiming associated model IDs via import. - Set GitLab project exported file permissions to owner only - - changed project-settings-button from fa-cog to fa-sliders. + - Changed settings-button from fa-cog to fa-sliders. v 8.12.3 - Update Gitlab Shell to support low IO priority for storage moves diff --git a/app/views/layouts/nav/_admin_settings.html.haml b/app/views/layouts/nav/_admin_settings.html.haml index 38e9b80d129..ffbd4a3b1a3 100644 --- a/app/views/layouts/nav/_admin_settings.html.haml +++ b/app/views/layouts/nav/_admin_settings.html.haml @@ -1,7 +1,7 @@ .controls .dropdown.admin-settings-dropdown %a.dropdown-new.btn.btn-default{href: '#', 'data-toggle' => 'dropdown'} - = icon('cog') + = icon('sliders') = icon('caret-down') %ul.dropdown-menu.dropdown-menu-align-right = nav_link(controller: :deploy_keys) do diff --git a/app/views/layouts/nav/_group_settings.html.haml b/app/views/layouts/nav/_group_settings.html.haml index 75275afc0f3..b1048e5dc59 100644 --- a/app/views/layouts/nav/_group_settings.html.haml +++ b/app/views/layouts/nav/_group_settings.html.haml @@ -8,7 +8,7 @@ .controls .dropdown.group-settings-dropdown %a.dropdown-new.btn.btn-default#group-settings-button{href: '#', 'data-toggle' => 'dropdown'} - = icon('cog') + = icon('sliders') = icon('caret-down') %ul.dropdown-menu.dropdown-menu-align-right - if can_admin_group |