Add latest changes from gitlab-org/gitlab@master

2 files changed, 25 insertions, 25 deletions

diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index 8815dec5a6b..717175e8eb3 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -14,7 +14,7 @@
           %span.nav-item-name
             = _('Overview')
         %ul.sidebar-sub-level-items
-          = nav_link(controller: %w[dashboard admin admin/projects users groups jobs runners gitaly_servers cohorts], html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: %w[dashboard admin admin/projects users groups jobs runners gitaly_servers cohorts], html_options: { class: "fly-out-top-item" }) do
             = link_to admin_root_path do
               %strong.fly-out-top-item-name
                 = _('Overview')
@@ -82,7 +82,7 @@
             = _('Monitoring')
 
         %ul.sidebar-sub-level-items{ data: { qa_selector: 'admin_monitoring_submenu_content' } }
-          = nav_link(controller: admin_monitoring_nav_links, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: admin_monitoring_nav_links, html_options: { class: "fly-out-top-item" }) do
             = link_to admin_system_info_path do
               %strong.fly-out-top-item-name
                 = _('Monitoring')
@@ -117,7 +117,7 @@
           %span.nav-item-name
             = _('Messages')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :broadcast_messages, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :broadcast_messages, html_options: { class: "fly-out-top-item" }) do
             = link_to admin_broadcast_messages_path do
               %strong.fly-out-top-item-name
                 = _('Messages')
@@ -129,7 +129,7 @@
           %span.nav-item-name
             = _('System Hooks')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: [:hooks, :hook_logs], html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: [:hooks, :hook_logs], html_options: { class: "fly-out-top-item" }) do
             = link_to admin_hooks_path do
               %strong.fly-out-top-item-name
                 = _('System Hooks')
@@ -141,7 +141,7 @@
           %span.nav-item-name
             = _('Applications')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :applications, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :applications, html_options: { class: "fly-out-top-item" }) do
             = link_to admin_applications_path do
               %strong.fly-out-top-item-name
                 = _('Applications')
@@ -154,7 +154,7 @@
             = _('Abuse Reports')
           = gl_badge_tag number_with_delimiter(AbuseReport.count(:all)), variant: :info, size: :sm
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :abuse_reports, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :abuse_reports, html_options: { class: "fly-out-top-item" }) do
             = link_to admin_abuse_reports_path do
               %strong.fly-out-top-item-name
                 = _('Abuse Reports')
@@ -170,7 +170,7 @@
             %span.nav-item-name
               = _('Kubernetes')
           %ul.sidebar-sub-level-items.is-fly-out-only
-            = nav_link(controller: :clusters, html_options: { class: "fly-out-top-item" } ) do
+            = nav_link(controller: :clusters, html_options: { class: "fly-out-top-item" }) do
               = link_to admin_clusters_path do
                 %strong.fly-out-top-item-name
                   = _('Kubernetes')
@@ -183,7 +183,7 @@
             %span.nav-item-name
               = _('Spam Logs')
           %ul.sidebar-sub-level-items.is-fly-out-only
-            = nav_link(controller: :spam_logs, html_options: { class: "fly-out-top-item" } ) do
+            = nav_link(controller: :spam_logs, html_options: { class: "fly-out-top-item" }) do
               = link_to admin_spam_logs_path do
                 %strong.fly-out-top-item-name
                   = _('Spam Logs')
@@ -199,7 +199,7 @@
           %span.nav-item-name
             = _('Deploy Keys')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :deploy_keys, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :deploy_keys, html_options: { class: "fly-out-top-item" }) do
             = link_to admin_deploy_keys_path do
               %strong.fly-out-top-item-name
                 = _('Deploy Keys')
@@ -213,7 +213,7 @@
           %span.nav-item-name
             = _('Labels')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :labels, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :labels, html_options: { class: "fly-out-top-item" }) do
             = link_to admin_labels_path do
               %strong.fly-out-top-item-name
                 = _('Labels')
@@ -227,7 +227,7 @@
 
         %ul.sidebar-sub-level-items{ data: { qa_selector: 'admin_settings_submenu_content' } }
           -# This active_nav_link check is also used in `app/views/layouts/admin.html.haml`
-          = nav_link(controller: [:application_settings, :integrations, :appearances], html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: [:application_settings, :integrations, :appearances], html_options: { class: "fly-out-top-item" }) do
             = link_to general_admin_application_settings_path do
               %strong.fly-out-top-item-name
                 = _('Settings')
@@ -273,7 +273,7 @@
               = link_to network_admin_application_settings_path, title: _('Network'), data: { qa_selector: 'admin_settings_network_link' } do
                 %span
                   = _('Network')
-            = nav_link(controller: :appearances ) do
+            = nav_link(controller: :appearances) do
               = link_to admin_application_settings_appearances_path do
                 %span
                   = _('Appearance')
diff --git a/app/views/layouts/nav/sidebar/_profile.html.haml b/app/views/layouts/nav/sidebar/_profile.html.haml
index 0e3327935ca..e1978009114 100644
--- a/app/views/layouts/nav/sidebar/_profile.html.haml
+++ b/app/views/layouts/nav/sidebar/_profile.html.haml
@@ -12,7 +12,7 @@
           %span.nav-item-name
             = _('Profile')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(path: 'profiles#show', html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(path: 'profiles#show', html_options: { class: "fly-out-top-item" }) do
             = link_to profile_path do
               %strong.fly-out-top-item-name
                 = _('Profile')
@@ -23,7 +23,7 @@
           %span.nav-item-name
             = _('Account')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: [:accounts, :two_factor_auths], html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: [:accounts, :two_factor_auths], html_options: { class: "fly-out-top-item" }) do
             = link_to profile_account_path do
               %strong.fly-out-top-item-name
                 = _('Account')
@@ -36,7 +36,7 @@
           %span.nav-item-name
             = _('Applications')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: 'oauth/applications', html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: 'oauth/applications', html_options: { class: "fly-out-top-item" }) do
             = link_to applications_profile_path do
               %strong.fly-out-top-item-name
                 = _('Applications')
@@ -47,7 +47,7 @@
           %span.nav-item-name
             = _('Chat')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :chat_names, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :chat_names, html_options: { class: "fly-out-top-item" }) do
             = link_to profile_chat_names_path do
               %strong.fly-out-top-item-name
                 = _('Chat')
@@ -59,7 +59,7 @@
             %span.nav-item-name
               = _('Access Tokens')
           %ul.sidebar-sub-level-items.is-fly-out-only
-            = nav_link(controller: :personal_access_tokens, html_options: { class: "fly-out-top-item" } ) do
+            = nav_link(controller: :personal_access_tokens, html_options: { class: "fly-out-top-item" }) do
               = link_to profile_personal_access_tokens_path do
                 %strong.fly-out-top-item-name
                   = _('Access Tokens')
@@ -70,7 +70,7 @@
           %span.nav-item-name
             = _('Emails')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :emails, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :emails, html_options: { class: "fly-out-top-item" }) do
             = link_to profile_emails_path do
               %strong.fly-out-top-item-name
                 = _('Emails')
@@ -82,7 +82,7 @@
             %span.nav-item-name
               = _('Password')
           %ul.sidebar-sub-level-items.is-fly-out-only
-            = nav_link(controller: :passwords, html_options: { class: "fly-out-top-item" } ) do
+            = nav_link(controller: :passwords, html_options: { class: "fly-out-top-item" }) do
               = link_to edit_profile_password_path do
                 %strong.fly-out-top-item-name
                   = _('Password')
@@ -93,7 +93,7 @@
           %span.nav-item-name
             = _('Notifications')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :notifications, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :notifications, html_options: { class: "fly-out-top-item" }) do
             = link_to profile_notifications_path do
               %strong.fly-out-top-item-name
                 = _('Notifications')
@@ -104,7 +104,7 @@
           %span.nav-item-name
             = _('SSH Keys')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :keys, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :keys, html_options: { class: "fly-out-top-item" }) do
             = link_to profile_keys_path do
               %strong.fly-out-top-item-name
                 = _('SSH Keys')
@@ -115,7 +115,7 @@
           %span.nav-item-name
             = _('GPG Keys')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :gpg_keys, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :gpg_keys, html_options: { class: "fly-out-top-item" }) do
             = link_to profile_gpg_keys_path do
               %strong.fly-out-top-item-name
                 = _('GPG Keys')
@@ -126,7 +126,7 @@
           %span.nav-item-name
             = _('Preferences')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :preferences, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :preferences, html_options: { class: "fly-out-top-item" }) do
             = link_to profile_preferences_path do
               %strong.fly-out-top-item-name
                 = _('Preferences')
@@ -137,7 +137,7 @@
           %span.nav-item-name
             = _('Active Sessions')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(controller: :active_sessions, html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(controller: :active_sessions, html_options: { class: "fly-out-top-item" }) do
             = link_to profile_active_sessions_path do
               %strong.fly-out-top-item-name
                 = _('Active Sessions')
@@ -148,7 +148,7 @@
           %span.nav-item-name
             = _('Authentication log')
         %ul.sidebar-sub-level-items.is-fly-out-only
-          = nav_link(path: 'profiles#audit_log', html_options: { class: "fly-out-top-item" } ) do
+          = nav_link(path: 'profiles#audit_log', html_options: { class: "fly-out-top-item" }) do
             = link_to audit_log_profile_path do
               %strong.fly-out-top-item-name
                 = _('Authentication Log')