Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 5 insertions, 2 deletions

diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml
index bf70149812a..c1a50cfe718 100644
--- a/app/views/shared/boards/_show.html.haml
+++ b/app/views/shared/boards/_show.html.haml
@@ -7,6 +7,8 @@
   - breadcrumb_title _("Epic Boards")
 - else
   - breadcrumb_title _("Issue Boards")
+  = render 'shared/alerts/positioning_disabled'
+
 - page_title("#{board.name}", _("Boards"))
 - add_page_specific_style 'page_bundles/boards'
 
diff --git a/app/views/shared/boards/components/sidebar/_assignee.html.haml b/app/views/shared/boards/components/sidebar/_assignee.html.haml
index c36f2c7c969..79817025565 100644
--- a/app/views/shared/boards/components/sidebar/_assignee.html.haml
+++ b/app/views/shared/boards/components/sidebar/_assignee.html.haml
@@ -1,9 +1,10 @@
 - dropdown_options = assignees_dropdown_options('issue')
+- relative_url = Gitlab.config.gitlab.relative_url_root || '/'
 
 .block.assignee{ ref: "assigneeBlock" }
   %template{ "v-if" => "issue.assignees" }
     %sidebar-assignees-widget{ ":iid" => "String(issue.iid)",
-      ":full-path" => "issue.path.split('/-/')[0].substring(1)",
+      ":full-path" => "issue.path.split('/-/')[0].substring(1).replace(`#{relative_url}`, '')",
       ":initial-assignees" => "issue.assignees",
-      ":multiple-assignees" => "!Boolean(#{dropdown_options[:data][:"max-select"]})",
+      ":allow-multiple-assignees" => "!Boolean(#{dropdown_options[:data][:"max-select"]})",
       "@assignees-updated" => "setAssignees" }