Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/repositories/gitlab/gitlabhq

app/helpers/application_helper.rb

@@ -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

@@ -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

@@ -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