Merge branch 'master' into oauth2_provider

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/nav/_profile.html.haml

1 files changed, 20 insertions, 12 deletions

diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index 8bb45e4a6d0..2821e5c0668 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -1,9 +1,10 @@
-%ul.nav-sidebar.navbar-collapse.collapse
+%ul.nav.nav-sidebar
   = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
     = link_to profile_path, title: "Profile" do
       %i.fa.fa-user
-      Profile
-  = nav_link(controller: [:accounts]) do
+      %span
+        Profile
+  = nav_link(controller: :accounts) do
     = link_to profile_account_path do
       %i.fa.fa-gear
       Account
@@ -14,33 +15,40 @@
   = nav_link(controller: :emails) do
     = link_to profile_emails_path do
       %i.fa.fa-envelope-o
-      Emails
-      %span.count= current_user.emails.count + 1
+      %span
+        Emails
+        %span.count= current_user.emails.count + 1
   - unless current_user.ldap_user?
     = nav_link(controller: :passwords) do
       = link_to edit_profile_password_path do
         %i.fa.fa-lock
-        Password
+        %span
+          Password
   = nav_link(controller: :notifications) do
     = link_to profile_notifications_path do
       %i.fa.fa-inbox
-      Notifications
+      %span
+        Notifications
 
   = nav_link(controller: :keys) do
     = link_to profile_keys_path do
       %i.fa.fa-key
-      SSH Keys
-      %span.count= current_user.keys.count
+      %span
+        SSH Keys
+        %span.count= current_user.keys.count
   = nav_link(path: 'profiles#design') do
     = link_to design_profile_path do
       %i.fa.fa-image
-      Design
+      %span
+        Design
   = nav_link(controller: :groups) do
     = link_to profile_groups_path do
       %i.fa.fa-group
-      Groups
+      %span
+        Groups
   = nav_link(path: 'profiles#history') do
     = link_to history_profile_path do
       %i.fa.fa-history
-      History
+      %span
+        History