Skip to content

Improve proj settings

Luke Bennett requested to merge proj-settings-ok into master

What does this MR do?

  • change section titles and descriptions
  • change the sorting as indicated (this is based on UX research findings)
  • clicking on section title expands/collapses the section
  • ‘Remove avatar’ can be a link button, doesn’t need to be so prominent
  • limit width of Project name to input-md (240px)
  • limit width of Project tags and project description to input-xl (560px)
  • reduce spacing between section dividers to 24px (top & bottom margin)
  • Merge request section
    • labels in ‘Merge request’ radio selection should be regular font weight. Explanations below the labels should be styled as ‘secondary’ text
    • ‘Description parsed with GitLab Flavored Markdown.’ should be regular, not italic and styled as ‘secondary’ text
    • labels in ‘Merge request’ checkboxes should be regular font weight. Explanations below the labels should be styled as ‘secondary’ text
    • ‘Save changes’ buttons should be disabled until there’s a change to save
  • Merge request approvals section
    • change the ‘Approvers’ label to ‘Add approvers’
    • limit the width of the ‘Approvers’ input field to input-lg (320px)
    • ‘Add’ button should be the default (white) style) and disabled until there’s something to add
    • ‘Approval required’ input field should be limited to input-xs (80px)
    • checkbox labels should be regular font weight
  • redesign the ‘Service desk’ section as indicated (button tooltip: Copy to clipboard)
  • move ‘Export project’ section into the ‘Advanced’ section (as indicated)
  • remove the 'Project name' input from the Rename repository section (duplicate of the same input in the Naming section on top)
  • change the title of 'Rename repository' to 'Change path'

Screenshots/recordings

screenshots Screenshot_2019-03-19_at_01.01.05

Screenshot_2019-03-21_at_18.12.33

Screenshot_2019-03-20_at_12.13.29

Screenshot_2019-03-20_at_12.13.36

Screenshot_2019-03-20_at_12.13.46

Screenshot_2019-03-20_at_12.13.42

Screenshot_2019-03-20_at_12.13.52

Screenshot_2019-03-20_at_12.14.02

Screenshot_2019-03-20_at_12.15.04

recordings Screen_Recording_2019-03-20_at_12.14.05

Screen_Recording_2019-03-20_at_12.16.25

Screen_Recording_2019-03-20_at_12.16.48

How do I see the service desk panel?

see diff 
diff --git a/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue b/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
index 0bba340f11c..a82eea7471d 100644
--- a/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
+++ b/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
@@ -82,6 +82,7 @@ export default {

     onEnableToggled(isChecked) {
       this.isEnabled = isChecked;
+      return;
       this.store.resetIncomingEmail();
       if (this.flash) {
         this.flash.remove();
diff --git a/ee/app/views/projects/_service_desk_settings.html.haml b/ee/app/views/projects/_service_desk_settings.html.haml
index 51958620be4..b5398e95459 100644
--- a/ee/app/views/projects/_service_desk_settings.html.haml
+++ b/ee/app/views/projects/_service_desk_settings.html.haml
@@ -1,4 +1,4 @@
-- if EE::Gitlab::ServiceDesk.enabled?(project: @project) || (show_promotions? && show_callout?('promote_service_desk_dismissed'))
+- if true || 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.no-animate#js-service-desk{ class: ('expanded' if expanded) }
     .settings-header
@@ -8,9 +8,9 @@
       - link_start = "<a href='#{help_page_path('user/project/service_desk')}' target='_blank' rel='noopener noreferrer'>".html_safe
       %p= _('Enable/disable your service desk. %{link_start}Learn more about service desk%{link_end}.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
     .settings-content
-      - if EE::Gitlab::ServiceDesk.enabled?(project: @project)
+      - if true || 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) } }
+          incoming_email: 'youre@mocking.it' || (@project.service_desk_address if @project.service_desk_enabled) } }
       - elsif show_promotions? && show_callout?('promote_service_desk_dismissed')
         = render 'shared/promotions/promote_servicedesk'

What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49738

Does this MR meet the acceptance criteria?

Edited by Luke Bennett

Merge request reports