Merge remote-tracking branch 'ee/master' into ce-to-ee-2017-08-18

* ee/master:
  Hide admin Audit Log in sidebar when not licensed

app/views/layouts/nav/_new_admin_sidebar.html.haml

 .nav-sidebar{ class: ("sidebar-icons-only" if collapsed_sidebar?) }
-  .nav-sidebar-inner-scroll
   .context-header
     = link_to admin_root_path, title: 'Admin Overview' do
       .avatar-container.s40.settings-avatar
@@ -43,6 +42,113 @@
             %span
               Cohorts
 
+    = nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles audit_logs)) do
+      = link_to admin_conversational_development_index_path, title: 'Monitoring' do
+        .nav-icon-container
+          = custom_icon('monitoring')
+        %span.nav-item-name
+          Monitoring
+
+      %ul.sidebar-sub-level-items
+        = nav_link(controller: :conversational_development_index) do
+          = link_to admin_conversational_development_index_path, title: 'ConvDev Index' do
+            %span
+              ConvDev Index
+        = nav_link(controller: :system_info) do
+          = link_to admin_system_info_path, title: 'System Info' do
+            %span
+              System Info
+        = nav_link(controller: :background_jobs) do
+          = link_to admin_background_jobs_path, title: 'Background Jobs' do
+            %span
+              Background Jobs
+        = nav_link(controller: :logs) do
+          = link_to admin_logs_path, title: 'Logs' do
+            %span
+              Logs
+        = nav_link(controller: :health_check) do
+          = link_to admin_health_check_path, title: 'Health Check' do
+            %span
+              Health Check
+        = nav_link(controller: :requests_profiles) do
+          = link_to admin_requests_profiles_path, title: 'Requests Profiles' do
+            %span
+              Requests Profiles
+        = render 'layouts/nav/ee/new_admin_monitoring_sidebar'
+
+    = nav_link(controller: :broadcast_messages) do
+      = link_to admin_broadcast_messages_path, title: 'Messages' do
+        .nav-icon-container
+          = custom_icon('messages')
+        %span.nav-item-name
+          Messages
+    = nav_link(controller: [:hooks, :hook_logs]) do
+      = link_to admin_hooks_path, title: 'Hooks' do
+        .nav-icon-container
+          = custom_icon('system_hooks')
+        %span.nav-item-name
+          System Hooks
+
+    = nav_link(controller: :applications) do
+      = link_to admin_applications_path, title: 'Applications' do
+        .nav-icon-container
+          = custom_icon('applications')
+        %span.nav-item-name
+          Applications
+
+    = nav_link(controller: :abuse_reports) do
+      = link_to admin_abuse_reports_path, title: "Abuse Reports" do
+        .nav-icon-container
+          = custom_icon('abuse_reports')
+        %span.nav-item-name
+          Abuse Reports
+        %span.badge.count= number_with_delimiter(AbuseReport.count(:all))
+
+    = nav_link(controller: :licenses) do
+      = link_to admin_license_path, title: 'License' do
+        .nav-icon-container
+          = custom_icon('license')
+        %span.nav-item-name
+          License
+
+    - if akismet_enabled?
+      = nav_link(controller: :spam_logs) do
+        = link_to admin_spam_logs_path, title: "Spam Logs" do
+          .nav-icon-container
+            = custom_icon('overview')
+          %span.nav-item-name
+            Overview
+
+        %ul.sidebar-sub-level-items
+          = nav_link(controller: :dashboard, html_options: {class: 'home'}) do
+            = link_to admin_root_path, title: 'Overview' do
+              %span
+                Dashboard
+          = nav_link(controller: [:admin, :projects]) do
+            = link_to admin_projects_path, title: 'Projects' do
+              %span
+                Projects
+          = nav_link(controller: :users) do
+            = link_to admin_users_path, title: 'Users' do
+              %span
+                Users
+          = nav_link(controller: :groups) do
+            = link_to admin_groups_path, title: 'Groups' do
+              %span
+                Groups
+          = nav_link path: 'jobs#index' do
+            = link_to admin_jobs_path, title: 'Jobs' do
+              %span
+                Jobs
+          = nav_link path: ['runners#index', 'runners#show'] do
+            = link_to admin_runners_path, title: 'Runners' do
+              %span
+                Runners
+          = nav_link path: 'cohorts#index' do
+            = link_to admin_cohorts_path, title: 'Cohorts' do
+              %span
+                Cohorts
+
       = nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles audit_logs)) do
         = link_to admin_conversational_development_index_path, title: 'Monitoring' do
           .nav-icon-container

ee/app/views/layouts/nav/ee/_new_admin_monitoring_sidebar.html.haml

+- if License.feature_available?(:admin_audit_log)
+  = nav_link path: 'audit_logs#index' do
+    = link_to admin_audit_logs_path, title: 'Audit Log' do
+      %span
+        Audit Log