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
Kazuhiko Shiozaki
gitlab-ce
Commits
9fa94cad
Commit
9fa94cad
authored
Oct 11, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/repositories/gitlab/gitlabhq
parents
4123c76e
b0502c20
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+2
-2
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-1
No files found.
app/helpers/application_helper.rb
View file @
9fa94cad
...
...
@@ -105,7 +105,7 @@ module ApplicationHelper
groups
=
current_user
.
authorized_groups
.
map
{
|
group
|
{
label:
"group:
#{
simple_sanitize
(
group
.
name
)
}
"
,
url:
group_path
(
group
)
}
}
default_nav
=
[
{
label:
"My Profile"
,
url:
profile_path
},
{
label:
"My Profile
settings
"
,
url:
profile_path
},
{
label:
"My SSH Keys"
,
url:
profile_keys_path
},
{
label:
"My Dashboard"
,
url:
root_path
},
{
label:
"Admin Section"
,
url:
admin_root_path
},
...
...
app/views/layouts/_head_panel.html.haml
View file @
9fa94cad
...
...
@@ -30,11 +30,11 @@
=
link_to
new_project_path
,
title:
"New project"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'New project'
do
%i
.icon-plus
%li
=
link_to
profile_path
,
title:
"
My profile"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'My profile
'
do
=
link_to
profile_path
,
title:
"
Profile settings"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Profile settings"
'
do
%i
.icon-user
%li
=
link_to
destroy_user_session_path
,
class:
"logout"
,
method: :delete
,
title:
"Logout"
,
class:
'has_bottom_tooltip'
,
'data-original-title'
=>
'Logout'
do
%i
.icon-signout
%li
=
link_to
current_user
,
class:
"profile-pic"
,
id:
'profile-pic'
do
=
image_tag
avatar_icon
(
current_user
.
email
,
26
),
alt:
''
=
image_tag
avatar_icon
(
current_user
.
email
,
26
),
alt:
'
User activity
'
app/views/users/show.html.haml
View file @
9fa94cad
...
...
@@ -7,7 +7,7 @@
.pull-right
=
link_to
profile_path
,
class:
'btn'
do
%i
.icon-edit
Edit Profile
Edit Profile
settings
%br
%small
#{
@user
.
username
}
%br
...
...
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