Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
ccc7a007
Commit
ccc7a007
authored
Jan 04, 2017
by
tauriedavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
26352 Change Profile settings to User / Settings
parent
80c9a1a0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
app/helpers/search_helper.rb
app/helpers/search_helper.rb
+1
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+2
-2
changelogs/unreleased/26352-user-dropdown-settings.yml
changelogs/unreleased/26352-user-dropdown-settings.yml
+4
-0
No files found.
app/helpers/search_helper.rb
View file @
ccc7a007
...
@@ -39,7 +39,7 @@ module SearchHelper
...
@@ -39,7 +39,7 @@ module SearchHelper
# Autocomplete results for various settings pages
# Autocomplete results for various settings pages
def
default_autocomplete
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:
"SSH Keys"
,
url:
profile_keys_path
},
{
category:
"Settings"
,
label:
"Dashboard"
,
url:
root_path
},
{
category:
"Settings"
,
label:
"Dashboard"
,
url:
root_path
},
{
category:
"Settings"
,
label:
"Admin Section"
,
url:
admin_root_path
},
{
category:
"Settings"
,
label:
"Admin Section"
,
url:
admin_root_path
},
...
...
app/views/layouts/header/_default.html.haml
View file @
ccc7a007
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
%li
%li
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
aria:
{
label:
"Profile"
},
data:
{
user:
current_user
.
username
}
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
aria:
{
label:
"Profile"
},
data:
{
user:
current_user
.
username
}
%li
%li
=
link_to
"
Profile Settings"
,
profile_path
,
aria:
{
label:
"Profile
Settings"
}
=
link_to
"
Settings"
,
profile_path
,
aria:
{
label:
"
Settings"
}
%li
%li
=
link_to
"Help"
,
help_path
,
aria:
{
label:
"Help"
}
=
link_to
"Help"
,
help_path
,
aria:
{
label:
"Help"
}
%li
.divider
%li
.divider
...
...
app/views/layouts/profile.html.haml
View file @
ccc7a007
-
page_title
"
Profile
Settings"
-
page_title
"
User
Settings"
-
header_title
"
Profile
Settings"
,
profile_path
unless
header_title
-
header_title
"
User
Settings"
,
profile_path
unless
header_title
-
sidebar
"dashboard"
-
sidebar
"dashboard"
-
nav
"profile"
-
nav
"profile"
...
...
changelogs/unreleased/26352-user-dropdown-settings.yml
0 → 100644
View file @
ccc7a007
---
title
:
26352 Change Profile settings to User / Settings
merge_request
:
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment