kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '26352-user-dropdown-settings' into 'master' 

26352 Change Profile settings to User / Settings

Closes #26352

See merge request !8453
This commit is contained in:
Annabel Dunstone Gray 2017-01-05 21:09:18 +00:00
parent 297e6e29f2 ccc7a00753
commit 76bb8ed48a
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/search_helper.rb
View File

@ -39,7 +39,7 @@ module SearchHelper
# Autocomplete results for various settings pages
def default_autocomplete
[
{ category: "Settings", label: "Profile settings", url: profile_path },
{ category: "Settings", label: "User settings", url: profile_path },
{ category: "Settings", label: "SSH Keys", url: profile_keys_path },
{ category: "Settings", label: "Dashboard", url: root_path },
{ category: "Settings", label: "Admin Section", url: admin_root_path },

2
app/views/layouts/header/_default.html.haml
View File

@ -44,7 +44,7 @@
%li
= link_to "Profile", current_user, class: 'profile-link', aria: { label: "Profile" }, data: { user: current_user.username }
%li
= link_to "Profile Settings", profile_path, aria: { label: "Profile Settings" }
= link_to "Settings", profile_path, aria: { label: "Settings" }
%li
= link_to "Help", help_path, aria: { label: "Help" }
%li.divider

4
app/views/layouts/profile.html.haml
View File

@ -1,5 +1,5 @@
- page_title "Profile Settings"
- header_title "Profile Settings", profile_path unless header_title
- page_title "User Settings"
- header_title "User Settings", profile_path unless header_title
- sidebar "dashboard"
- nav "profile"

4
changelogs/unreleased/26352-user-dropdown-settings.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: 26352 Change Profile settings to User / Settings
merge_request:
author: