Add latest changes from gitlab-org/gitlab@master

6 files changed, 4 insertions, 10 deletions

diff --git a/app/views/projects/issues/_by_email_description.html.haml b/app/views/projects/issues/_by_email_description.html.haml
deleted file mode 100644
index aeed5fb69c9..00000000000
--- a/app/views/projects/issues/_by_email_description.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-The subject will be used as the title of the new issue, and the message will be the description.
-
-= link_to 'Quick actions', help_page_path('user/project/quick_actions'), target: '_blank', rel: 'noopener noreferrer'
-and styling with
-= link_to 'Markdown', help_page_path('user/markdown'), target: '_blank', rel: 'noopener noreferrer'
-are supported.
diff --git a/app/views/projects/issues/service_desk.html.haml b/app/views/projects/issues/service_desk.html.haml
index fb5880f633a..93cb5ddd7e2 100644
--- a/app/views/projects/issues/service_desk.html.haml
+++ b/app/views/projects/issues/service_desk.html.haml
@@ -3,7 +3,7 @@
 - page_title _("Service Desk")
 - add_page_specific_style 'page_bundles/issues_list'
 - content_for :breadcrumbs_extra do
-  = render "projects/issues/nav_btns", show_export_button: false, show_rss_button: false
+  = render "projects/issues/service_desk/nav_btns", show_export_button: false, show_rss_button: false
 
 - support_bot_attrs = { service_desk_enabled: @project.service_desk_enabled?, **UserSerializer.new.represent(User.support_bot) }.to_json
 
@@ -11,12 +11,12 @@
   .top-area
     = render 'shared/issuable/nav', type: :issues
     .nav-controls.d-block.d-sm-none
-      = render "projects/issues/nav_btns", show_feed_buttons: false, show_import_button: false, show_export_button: false
+      = render "projects/issues/service_desk/nav_btns", show_feed_buttons: false, show_import_button: false, show_export_button: false
 
   - if @issues.present?
     = render 'shared/issuable/search_bar', type: :issues
     - if Gitlab::ServiceDesk.supported?
-      = render 'service_desk_info_content'
+      = render 'projects/issues/service_desk/service_desk_info_content'
 
   .issues-holder
-    = render 'projects/issues/issues', empty_state_path: 'service_desk_empty_state'
+    = render 'projects/issues/issues', empty_state_path: 'projects/issues/service_desk/service_desk_empty_state'
diff --git a/app/views/projects/issues/_alert_moved_from_service_desk.html.haml b/app/views/projects/issues/service_desk/_alert_moved_from_service_desk.html.haml
index cc8d5bdaeec..cc8d5bdaeec 100644
--- a/app/views/projects/issues/_alert_moved_from_service_desk.html.haml
+++ b/app/views/projects/issues/service_desk/_alert_moved_from_service_desk.html.haml
diff --git a/app/views/projects/issues/_nav_btns.html.haml b/app/views/projects/issues/service_desk/_nav_btns.html.haml
index 8d16c3d978f..8d16c3d978f 100644
--- a/app/views/projects/issues/_nav_btns.html.haml
+++ b/app/views/projects/issues/service_desk/_nav_btns.html.haml
diff --git a/app/views/projects/issues/_service_desk_empty_state.html.haml b/app/views/projects/issues/service_desk/_service_desk_empty_state.html.haml
index 1c9143c633d..1c9143c633d 100644
--- a/app/views/projects/issues/_service_desk_empty_state.html.haml
+++ b/app/views/projects/issues/service_desk/_service_desk_empty_state.html.haml
diff --git a/app/views/projects/issues/_service_desk_info_content.html.haml b/app/views/projects/issues/service_desk/_service_desk_info_content.html.haml
index bad75ac2cd9..bad75ac2cd9 100644
--- a/app/views/projects/issues/_service_desk_info_content.html.haml
+++ b/app/views/projects/issues/service_desk/_service_desk_info_content.html.haml