Cosmetic changes

app/assets/javascripts/dispatcher.js

@@ -370,11 +370,6 @@ import initGroupAnalytics from './init_group_analytics';
           shortcut_handler = new ShortcutsNavigation();
           GpgBadges.fetch();
           break;
-        case 'projects:edit':
-          new UsersSelect();
-          new UserCallout('js-service-desk-callout');
-          new UserCallout('js-mr-approval-callout');
-          break;
         case 'projects:imports:show':
           new ProjectImport();
           break;
@@ -398,7 +393,8 @@ import initGroupAnalytics from './init_group_analytics';
           setupProjectEdit();
           // Initialize expandable settings panels
           initSettingsPanels();
-          new UsersSelect();
+          new UserCallout('js-service-desk-callout');
+          new UserCallout('js-mr-approval-callout');
           break;
         case 'projects:imports:show':
           new ProjectImport();

app/assets/stylesheets/pages/promotions.scss

@@ -5,6 +5,10 @@
     margin-top: 10px;
   }
 
+  &.append-bottom-20 {
+    margin-bottom: 20px;
+  }
+
   .bordered-box {
     padding: 20px;
     border-color: $border-color;
@@ -12,7 +16,7 @@
     align-items: flex-start;
 
     .user-callout-copy {
-      max-width: inherit;
+      max-width: 700px;
     }
 
     .close {
@@ -38,12 +42,17 @@
 
 .promotion-modal {
 
+  .modal-dialog {
+    width: 540px;
+  }
+
   .modal-header {
     border-bottom: none;
   }
 
   .modal-body {
     margin-top: -20px;
+    padding: 16px 16px 32px 16px;
   }
 
   .modal-footer {
@@ -55,5 +64,9 @@
 .promotion-backdrop {
   background-color: $white-transparent;
   position: absolute;
-  padding-top: 20px;
+  padding-top: 72px;
+
+  .user-callout-copy {
+    max-width: 700px;
+  }
 }

app/views/projects/edit.html.haml

@@ -163,29 +163,28 @@
       %p
         Customize your merge request restrictions.
     .settings-content.no-animate{ class: ('expanded' if expanded) }
+      - if !@project.feature_available?(:fast_forward_merge) && show_promotions? && show_callout?('promote_mr_approval_dismissed')
+        = render 'shared/promotions/promote_mr_approval'
       = 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"
 
-  - if !@project.feature_available?(:fast_forward_merge) && show_promotions? && show_callout?('promote_mr_approval_dismissed')
-    = render 'shared/promotions/promote_mr_approval'
-
-  - if EE::Gitlab::ServiceDesk.enabled?(project: @project)
-    %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) }
+  %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'
+      - elsif show_promotions? && show_callout?('promote_service_desk_dismissed')
+        = render 'shared/promotions/promote_servicedesk'
 
   = render 'export', project: @project
 

app/views/projects/protected_branches/_index.html.haml

 - content_for :page_specific_javascripts do
   = page_specific_javascript_bundle_tag('protected_branches')
 
-- if show_promotions? && show_callout?('promote_repository_features_dismissed')
-  = render 'shared/promotions/promote_repository_features'
-
 - content_for :create_protected_branch do
   = render 'projects/protected_branches/create_protected_branch'
 

app/views/projects/settings/repository/show.html.haml

@@ -25,3 +25,6 @@
   = render "projects/protected_tags/index"
 
 = render @deploy_keys
+
+- if show_promotions? && show_callout?('promote_repository_features_dismissed')
+  = render 'shared/promotions/promote_repository_features'

app/views/shared/promotions/_promote_audit_events.html.haml

-.center.promotion-backdrop
+.center.promotion-backdrop.append-top-72
   .svg-container
     = custom_icon('icon_audit_events_purple')
   .user-callout-copy

app/views/shared/promotions/_promote_csv_export.html.haml

@@ -16,5 +16,4 @@
           %p
             Export Issues to CSV enables you and your team to export all the data collected from issues into a comma-separated values (CSV) file, which stores tabular data in plain text.
             %a{ href: '/help/user/project/issues/csv_export.html', target: '_blank' } Read more
-      .modal-footer.center
-        = render 'shared/promotions/promotion_link_project'
+          = render 'shared/promotions/promotion_link_project'

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

-.user-callout.promotion-callout.js-mr-approval-callout{ id: 'promote_mr_approval', data: { uid: 'promote_mr_approval_dismissed' } }
+.user-callout.promotion-callout.append-bottom-20.js-mr-approval-callout{ id: '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')
@@ -17,9 +17,5 @@
           %a{ href: '/help/user/project/merge_requests/fast_forward_merge.html', target: '_blank' } Fast-forward Merge
           %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.
-        %li
-          %a{ href: '/help/user/project/service_desk.html', target: '_blank' } GitLab Service Desk
-          %p
-            GitLab Service Desk is a simple way to allow people to create issues in your GitLab instance without needing their own user account.
 
       = render 'shared/promotions/promotion_link_project'

app/views/shared/promotions/_promote_repository_features.html.haml

@@ -22,6 +22,6 @@
         %li
           %a{ href: '/help/user/project/protected_branches.html', target: '_blank' } Protected Branches
           %p
-            Permissions in GitLab are fundamentally defined around the idea of having read or write permission to the repository and branches. To prevent people from messing with history or pushing code without review, we've created protected branches.
+            With GitLab Enterprise Edition you can restrict access to protected branches by choosing a role (Masters, Developers) as well as certain users.
 
       = render 'shared/promotions/promotion_link_project'