Commit 9fa94cad560d9443d3d08307b3902791fb711b95
Exists in
master
and in
4 other branches
Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/repositories/gitlab/gitlabhq
Showing
3 changed files
with
4 additions
and
4 deletions
Show diff stats
app/helpers/application_helper.rb
| ... | ... | @@ -105,7 +105,7 @@ module ApplicationHelper |
| 105 | 105 | groups = current_user.authorized_groups.map { |group| { label: "group: #{simple_sanitize(group.name)}", url: group_path(group) } } |
| 106 | 106 | |
| 107 | 107 | default_nav = [ |
| 108 | - { label: "My Profile", url: profile_path }, | |
| 108 | + { label: "My Profile settings", url: profile_path }, | |
| 109 | 109 | { label: "My SSH Keys", url: profile_keys_path }, |
| 110 | 110 | { label: "My Dashboard", url: root_path }, |
| 111 | 111 | { label: "Admin Section", url: admin_root_path }, | ... | ... |
app/views/layouts/_head_panel.html.haml
| ... | ... | @@ -30,11 +30,11 @@ |
| 30 | 30 | = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do |
| 31 | 31 | %i.icon-plus |
| 32 | 32 | %li |
| 33 | - = link_to profile_path, title: "My profile", class: 'has_bottom_tooltip', 'data-original-title' => 'My profile' do | |
| 33 | + = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do | |
| 34 | 34 | %i.icon-user |
| 35 | 35 | %li |
| 36 | 36 | = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do |
| 37 | 37 | %i.icon-signout |
| 38 | 38 | %li |
| 39 | 39 | = link_to current_user, class: "profile-pic", id: 'profile-pic' do |
| 40 | - = image_tag avatar_icon(current_user.email, 26), alt: '' | |
| 40 | + = image_tag avatar_icon(current_user.email, 26), alt: 'User activity' | ... | ... |