8 files changed, 25 insertions, 6 deletions
diff --git a/app/views/groups/_settings_nav.html.haml b/app/views/groups/_settings_nav.html.haml
index 82d760f7c41..35180792a0d 100644
--- a/app/views/groups/_settings_nav.html.haml
+++ b/app/views/groups/_settings_nav.html.haml
@@ -2,9 +2,10 @@
   = nav_link(path: 'groups#edit') do
     = link_to edit_group_path(@group) do
       %i.fa.fa-pencil-square-o
-      Group
+      %span
+        Group
   = nav_link(path: 'groups#projects') do
     = link_to projects_group_path(@group) do
       %i.fa.fa-folder
-      Projects
-
+      %span
+        Projects
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index eda37f8237a..e98b8ec631d 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -44,3 +44,5 @@
           %li.hidden-xs
             = link_to current_user, class: "profile-pic", id: 'profile-pic' do
               = image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
+
+= render 'shared/outdated_browser'
diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
index 9bfc14d16c1..02a5e4868d1 100644
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -20,3 +20,4 @@
           %li.visible-xs
             = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes')
 
+= render 'shared/outdated_browser'
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 06de03eadad..6539a24119c 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -6,6 +6,7 @@
       .content
         .login-title
           %h1= brand_title
+    = render 'shared/outdated_browser'
     %hr
     .container
       .content
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index 36b48a5d02d..cc50b9b570a 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -7,7 +7,8 @@
   = nav_link(controller: :accounts) do
     = link_to profile_account_path do
       %i.fa.fa-gear
-      Account
+      %span
+        Account
   = nav_link(path: ['profiles#applications', 'applications#edit', 'applications#show', 'applications#new']) do
     = link_to applications_profile_path do
       %i.fa.fa-cloud
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index a044fad8fa3..96fe91b9b20 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -17,6 +17,13 @@
 
     .radio
       = label_tag nil, class: '' do
+        = radio_button_tag :notification_level, Notification::N_MENTION, @notification.mention?, class: 'trigger-submit'
+        .level-title
+          Mention
+        %p You will receive notifications only for comments where you was @mentioned
+
+    .radio
+      = label_tag nil, class: '' do
         = radio_button_tag :notification_level, Notification::N_PARTICIPATING, @notification.participating?, class: 'trigger-submit'
         .level-title
           Participating
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 5717c24c274..56956625e0b 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -11,8 +11,6 @@
 
 %ul.breadcrumb.repo-breadcrumb
   = commits_breadcrumbs
-  %li.active
-    commits
 
 %div{id: dom_id(@project)}
   #commits-list= render "commits"
diff --git a/app/views/shared/_outdated_browser.html.haml b/app/views/shared/_outdated_browser.html.haml
new file mode 100644
index 00000000000..0eba1fe075f
--- /dev/null
+++ b/app/views/shared/_outdated_browser.html.haml
@@ -0,0 +1,8 @@
+- if outdated_browser?
+  - link = "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/requirements.md#supported-web-browsers"
+  .browser-alert
+    GitLab may not work properly because you are using an outdated web browser.
+    %br
+    Please install a
+    = link_to 'supported web browser', link
+    for a better experience.