Resolve CE/EE diffs in app/views/layouts view

Part of single codebase changes.

app/helpers/nav_helper.rb

@@ -58,6 +58,14 @@ module NavHelper
       current_path?('milestones#show')
   end
 
+  def admin_monitoring_nav_links
+    %w(system_info background_jobs logs health_check requests_profiles)
+  end
+
+  def group_issues_sub_menu_items
+    %w(groups#issues labels#index milestones#index boards#index boards#show)
+  end
+
   private
 
   def get_header_links

app/mailers/devise_mailer.rb

@@ -7,6 +7,7 @@ class DeviseMailer < Devise::Mailer
   layout 'mailer/devise'
 
   helper EmailsHelper
+  helper ApplicationHelper
 
   protected
 

app/views/layouts/_head.html.haml

@@ -77,3 +77,4 @@
 
   = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id')
   = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id')
+  = render_if_exists 'layouts/snowplow'

app/views/layouts/_mailer.html.haml

@@ -64,6 +64,8 @@
                       %tbody
                         = yield
 
+        = render_if_exists 'layouts/mailer/additional_text'
+
         %tr.footer
           %td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;" }
             %img{ alt: "GitLab", height: "33", src: image_url('mailers/gitlab_footer_logo.gif'), style: "display:block;margin:0 auto 1em;", width: "90" }/

app/views/layouts/_page.html.haml

@@ -5,6 +5,7 @@
     = render 'shared/outdated_browser'
     .mobile-overlay
     .alert-wrapper
+      = render_if_exists "layouts/header/ee_license_banner"
       = render "layouts/broadcast"
       = render "layouts/header/read_only_banner"
       = render "layouts/nav/classification_level_banner"

app/views/layouts/devise.html.haml

@@ -26,6 +26,9 @@
 
               - if Gitlab::CurrentSettings.sign_in_text.present?
                 = markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text)
+
+              = render_if_exists 'layouts/devise_help_text'
+
             .col-sm-5.new-session-forms-container
               = yield
 

app/views/layouts/header/_help_dropdown.html.haml

@@ -8,6 +8,7 @@
     = link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback"
   - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile)
     = render 'shared/user_dropdown_contributing_link'
+  = render_if_exists 'shared/user_dropdown_instance_review'
   - if Gitlab.com?
     %li.js-canary-link
       = link_to _("Switch to GitLab Next"), "https://next.gitlab.com/"

app/views/layouts/mailer.text.erb

@@ -4,5 +4,6 @@
 
 -- <%# signature marker %>
 <%= _("You're receiving this email because of your account on %{host}.") % { host: Gitlab.config.gitlab.host } %>
+<%= render_if_exists 'layouts/mailer/additional_text' %>
 
 <%= text_footer_message %>

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

@@ -95,3 +95,4 @@
       = link_to sherlock_transactions_path, class: 'admin-icon d-none d-lg-block d-xl-block', title: _('Sherlock Transactions'),
         data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
         = icon('tachometer fw')
+  = render_if_exists 'layouts/nav/geo_primary_node_url'

app/views/layouts/nav/sidebar/_admin.html.haml

@@ -48,7 +48,7 @@
               %span
                 = _('Gitaly Servers')
 
-      = nav_link(controller: %w(system_info background_jobs logs health_check requests_profiles)) do
+      = nav_link(controller: admin_monitoring_nav_links) do
         = link_to admin_system_info_path do
           .nav-icon-container
             = sprite_icon('monitor')
@@ -81,6 +81,7 @@
             = link_to admin_requests_profiles_path, title: _('Requests Profiles') do
               %span
                 = _('Requests Profiles')
+          = render_if_exists 'layouts/nav/ee/admin/new_monitoring_sidebar'
 
       = nav_link(controller: :broadcast_messages) do
         = link_to admin_broadcast_messages_path do
@@ -132,6 +133,8 @@
                 = _('Abuse Reports')
               %span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(AbuseReport.count(:all))
 
+      = render_if_exists 'layouts/nav/sidebar/licenses_link'
+
       - if instance_clusters_enabled?
         = nav_link(controller: :clusters) do
           = link_to admin_clusters_path do
@@ -158,6 +161,10 @@
                 %strong.fly-out-top-item-name
                   = _('Spam Logs')
 
+      = render_if_exists 'layouts/nav/sidebar/push_rules_link'
+
+      = render_if_exists 'layouts/nav/ee/admin/geo_sidebar'
+
       = nav_link(controller: :deploy_keys) do
         = link_to admin_deploy_keys_path do
           .nav-icon-container

app/views/layouts/nav/sidebar/_group.html.haml

@@ -1,6 +1,5 @@
 - issues_count = group_issues_count(state: 'opened')
 - merge_requests_count = group_merge_requests_count(state: 'opened')
-- issues_sub_menu_items = ['groups#issues', 'labels#index', 'milestones#index', 'boards#index', 'boards#show']
 
 .nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) }
   .nav-sidebar-inner-scroll
@@ -51,7 +50,7 @@
       = render_if_exists "layouts/nav/ee/epic_link", group: @group
 
       - if group_sidebar_link?(:issues)
-        = nav_link(path: issues_sub_menu_items) do
+        = nav_link(path: group_issues_sub_menu_items) do
           = link_to issues_group_path(@group) do
             .nav-icon-container
               = sprite_icon('issues')

app/views/layouts/nav/sidebar/_profile.html.haml

@@ -28,6 +28,8 @@
             = link_to profile_account_path do
               %strong.fly-out-top-item-name
                 = _('Account')
+
+      = render_if_exists 'layouts/nav/sidebar/profile_billing_link'
       = nav_link(controller: 'oauth/applications') do
         = link_to applications_profile_path do
           .nav-icon-container
@@ -151,4 +153,6 @@
               %strong.fly-out-top-item-name
                 = _('Authentication Log')
 
+      = render_if_exists 'layouts/nav/sidebar/profile_pipeline_quota_link'
+
     = render 'shared/sidebar_toggle_button'

app/views/layouts/nav/sidebar/_project.html.haml

@@ -270,6 +270,8 @@
                         %span= _("Got it!")
                         = sprite_icon('thumb-up')
 
+            = render_if_exists 'layouts/nav/sidebar/project_feature_flags_link'
+
       - if project_nav_tab? :container_registry
         = nav_link(controller: %w[projects/registry/repositories]) do
           = link_to project_container_registry_index_path(@project), class: 'shortcuts-container-registry' do
@@ -283,7 +285,9 @@
                 %strong.fly-out-top-item-name
                   = _('Registry')
 
-      - if project_nav_tab?(:wiki)
+      = render_if_exists 'layouts/nav/sidebar/project_packages_link'
+
+      - if project_nav_tab? :wiki
         - wiki_url = project_wiki_path(@project, :home)
         = nav_link(controller: :wikis) do
           = link_to wiki_url, class: 'shortcuts-wiki qa-wiki-link' do

app/views/layouts/notify.html.haml

@@ -31,4 +31,6 @@
             adjust your notification settings.
 
           = email_action @target_url
+
+        = render_if_exists 'layouts/email_additional_text'
         = html_footer_message

app/views/layouts/notify.text.erb

@@ -12,5 +12,6 @@
 <%  end -%>
 
 <%= "You're receiving this email because #{notification_reason_text(@reason)}." %>
+<%= render_if_exists 'layouts/mailer/additional_text' %>
 
 <%= text_footer_message -%>

spec/helpers/nav_helper_spec.rb

@@ -50,4 +50,16 @@ describe NavHelper do
       expect(helper.header_links).to contain_exactly(:sign_in, :search)
     end
   end
+
+  context '.admin_monitoring_nav_links' do
+    subject { helper.admin_monitoring_nav_links }
+
+    it { is_expected.to all(be_a(String)) }
+  end
+
+  context '.group_issues_sub_menu_items' do
+    subject { helper.group_issues_sub_menu_items }
+
+    it { is_expected.to all(be_a(String)) }
+  end
 end