Fixes to Logic based on MR

app/controllers/groups/analytics_controller.rb

 class Groups::AnalyticsController < Groups::ApplicationController
-  include LicenseHelper
-
   before_action :group
   before_action :check_contribution_analytics_available!
 

app/helpers/license_helper.rb

@@ -77,6 +77,9 @@ module LicenseHelper
 
   def show_promotions?(selected_user = current_user)
     if selected_user
+      return @show_promotions if defined?(@show_promotions)
+
+      @show_promotions = 
         if current_application_settings.should_check_namespace_plan?
           true
         else

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

@@ -149,8 +149,7 @@
               = nav_link(controller: :environments) do
                 = link_to project_environments_path(@project), title: 'Environments', class: 'shortcuts-environments' do
                   %span
-                    Pages
-            = render 'projects/settings/ee/nav'
+                    Environments
 
             - if @project.feature_available?(:builds, current_user) && !@project.empty_repo?
               = nav_link(path: 'pipelines#charts') do
@@ -213,6 +212,8 @@
                     %span
                       Pages
 
+              = render 'projects/settings/ee/nav'
+
       - else
         = nav_link(path: %w[members#show]) do
           = link_to project_settings_members_path(@project), title: 'Members', class: 'shortcuts-tree' do

app/views/projects/edit.html.haml

@@ -163,28 +163,13 @@
       %p
         Customize your merge request restrictions.
     .settings-content.no-animate{ class: ('expanded' if expanded) }
-      - if show_project_feature_promotion?(:merge_request_approvers, 'promote_mr_approval_dismissed')
-        = render 'shared/promotions/promote_mr_approval'
+      = render 'shared/promotions/promote_mr_features'
+
       = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "merge-request-settings-form" }, authenticity_token: true do |f|
         = render 'merge_request_settings', form: f
         = f.submit 'Save changes', class: "btn btn-save"
 
-  %section.settings.js-service-desk-setting-wrapper
-    .settings-header
-      %h4
-        Service Desk
-      %button.btn.js-settings-toggle
-        = expanded ? 'Collapse' : 'Expand'
-      %p
-        Customize your service desk settings.
-        = link_to "Learn more about service desk.", help_page_path('user/project/service_desk')
-    .settings-content.no-animate{ class: ('expanded' if expanded) }
-      - if EE::Gitlab::ServiceDesk.enabled?(project: @project)
-        .js-service-desk-setting-root{ data: { endpoint: project_service_desk_path(@project),
-          enabled: "#{@project.service_desk_enabled}",
-          incoming_email: (@project.service_desk_address if @project.service_desk_enabled) } }
-      - elsif show_promotions? && show_callout?('promote_service_desk_dismissed')
-        = render 'shared/promotions/promote_servicedesk'
+  = render 'projects/ee/service_desk_settings'
 
   = render 'export', project: @project
 

app/views/projects/issues/export_issues/_csv_download.html.haml

@@ -19,5 +19,5 @@
             in an attachment.
         .modal-footer
           = link_to 'Export issues', export_csv_project_issues_path(@project, request.query_parameters), method: :post, class: 'btn btn-success pull-left', title: 'Export issues'
-- else
+- elsif show_promotions?
   = render 'shared/promotions/promote_csv_export'

app/views/shared/milestones/_burndown.html.haml

@@ -34,5 +34,4 @@
           this milestone and the chart will appear here, always up-to-date.
 
         = link_to "Add start and due date", edit_project_milestone_path(project, milestone), class: 'btn'
-- elsif show_promotions? && show_callout?('promote_burndown_charts_dismissed')
-  = render 'shared/promotions/promote_burndown_charts'
+= render 'shared/promotions/promote_burndown_charts'

ee/app/views/projects/ee/_service_desk_settings.html.haml

+- if EE::Gitlab::ServiceDesk.enabled?(project: @project) || (show_promotions? && show_callout?('promote_service_desk_dismissed'))
+  - expanded = Rails.env.test?
+  %section.settings.js-service-desk-setting-wrapper
+    .settings-header
+      %h4
+        Service Desk
+      %button.btn.js-settings-toggle
+        = expanded ? 'Collapse' : 'Expand'
+      %p
+        Customize your service desk settings.
+        = link_to "Learn more about service desk.", help_page_path('user/project/service_desk')
+    .settings-content.no-animate{ class: ('expanded' if expanded) }
+      - if EE::Gitlab::ServiceDesk.enabled?(project: @project)
+        .js-service-desk-setting-root{ data: { endpoint: project_service_desk_path(@project),
+          enabled: "#{@project.service_desk_enabled}",
+          incoming_email: (@project.service_desk_address if @project.service_desk_enabled) } }
+      - elsif show_promotions? && show_callout?('promote_service_desk_dismissed')
+        = render 'shared/promotions/promote_servicedesk'

ee/app/views/shared/promotions/_promote_burndown_charts.html.haml

-.user-callout.promotion-callout#promote_burndown_charts{ data: { uid: 'promote_burndown_charts_dismissed' } }
+- if show_promotions? && show_callout?('promote_burndown_charts_dismissed')
+  .user-callout.promotion-callout#promote_burndown_charts{ data: { uid: 'promote_burndown_charts_dismissed' } }
     .bordered-box.content-block
       %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss burndown charts promotion' }
         = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')

ee/app/views/shared/promotions/_promote_mr_approval.html.haml

-.user-callout.promotion-callout.append-bottom-20.js-mr-approval-callout#promote_mr_approval{ data: { uid: 'promote_mr_approval_dismissed' } }
-  .bordered-box.content-block
-    %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss Merge Request promotion' }
-      = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')
-    .user-callout-copy
-      %h4
-        - if current_application_settings.should_check_namespace_plan?
-          Upgrade your plan to improve Merge Requests and customer support.
-        - else
-          Improve Merge Requests and customer support with GitLab Enterprise Edition.
-      %ul
-        - if !@project.feature_available?(:merge_request_approvers)
-          %li
-            = link_to 'Merge Request Approvals', help_page_path('user/project/merge_requests/merge_request_approvals.html'), target: '_blank'
-            %p
-              Merge request approvals allow you to set the number of necessary approvals and predefine a list of approvers that will need to approve every merge request in a project.
-        - if !@project.feature_available?(:fast_forward_merge)
-          %li
-            = link_to 'Fast-forward Merge', help_page_path('user/project/merge_requests/fast_forward_merge.html'), target: '_blank'
-            %p
-              If you prefer a linear Git history and a way to accept merge requests without creating merge commits, you can configure this on a per-project basis.
-
-      = render 'shared/promotions/promotion_link_project'

ee/app/views/shared/promotions/_promote_mr_features.html.haml

+- if show_project_feature_promotion?(:merge_request_approvers, 'promote_mr_features_dismissed') || show_project_feature_promotion?(:fast_forward_merge, 'promote_mr_features_dismissed')
+  .user-callout.promotion-callout.append-bottom-20.js-mr-approval-callout#promote_mr_features{ data: { uid: 'promote_mr_features_dismissed' } }
+    .bordered-box.content-block
+      %button.btn.btn-default.close.js-close-callout{ type: 'button', 'aria-label' => 'Dismiss Merge Request promotion' }
+        = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')
+      .user-callout-copy
+        %h4
+          - if current_application_settings.should_check_namespace_plan?
+            Upgrade your plan to improve Merge Requests.
+          - else
+            Improve Merge Requests and customer support with GitLab Enterprise Edition.
+        %ul
+          - unless @project.feature_available?(:merge_request_approvers)
+            %li
+              = link_to 'Merge Request Approvals', help_page_path('user/project/merge_requests/merge_request_approvals.html'), target: '_blank'
+              %p
+                Merge request approvals allow you to set the number of necessary approvals and predefine a list of approvers that will need to approve every merge request in a project.
+          - unless @project.feature_available?(:fast_forward_merge)
+            %li
+              = link_to 'Fast-forward Merge', help_page_path('user/project/merge_requests/fast_forward_merge.html'), target: '_blank'
+              %p
+                If you prefer a linear Git history and a way to accept merge requests without creating merge commits, you can configure this on a per-project basis.
+
+        = render 'shared/promotions/promotion_link_project'

ee/app/views/shared/promotions/_promotion_link_project.html.haml

 - if current_application_settings.should_check_namespace_plan?
-  - if @project.group ? can?(current_user, :admin_group, @project.group) : @project.owner == current_user
+  - if can?(current_user, :admin_namespace, @project.namespace)
     = link_to 'Upgrade your plan', upgrade_plan_url, class: 'btn btn-primary'
   - elsif @project.group
     %p Contact an owner of group #{ @project.group.name } to upgrade the plan.

spec/features/promotion_spec.rb

@@ -106,19 +106,19 @@ describe 'Promotions', js: true do
 
     it 'should appear in project edit page' do
       visit edit_project_path(project)
-      expect(find('#promote_mr_approval')).to have_content 'Improve Merge Requests and customer support'
+      expect(find('#promote_mr_features')).to have_content 'Improve Merge Requests'
     end
 
     it 'does not show when cookie is set' do
       visit edit_project_path(project)
 
-      within('#promote_mr_approval') do
+      within('#promote_mr_features') do
         find('.close').trigger('click')
       end
 
       visit edit_project_path(project)
 
-      expect(page).not_to have_selector('#promote_mr_approval')
+      expect(page).not_to have_selector('#promote_mr_features')
     end
   end