summaryrefslogtreecommitdiff
path: root/app/views/shared/issuable
diff options
context:
space:
mode:
authorSamantha Ming <sming@gitlab.com>2019-07-25 19:30:50 -0700
committerPaul Slaughter <pslaughter@gitlab.com>2019-08-20 15:15:18 -0500
commitf1f34baf6f4e0866feb3f4c7523e3dccf5784b0b (patch)
tree0922f96df924d9e9bf99ccc3a047683b7586b9c7 /app/views/shared/issuable
parentfd589be32f02c160812bbce0f5fb2178fb7142d3 (diff)
downloadgitlab-ce-f1f34baf6f4e0866feb3f4c7523e3dccf5784b0b.tar.gz
Improve UX multi assigness in MR
Add merge warning on avatar in: - open view assigness - collapsed view assigness - dropdown (search) view assigness Add can_merge option to MR sidebar entity
Diffstat (limited to 'app/views/shared/issuable')
-rw-r--r--app/views/shared/issuable/_sidebar_assignees.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml
index ab01094ed6e..1dc538826dc 100644
--- a/app/views/shared/issuable/_sidebar_assignees.html.haml
+++ b/app/views/shared/issuable/_sidebar_assignees.html.haml
@@ -20,6 +20,8 @@
placeholder: _('Search users'),
data: { first_user: issuable_sidebar.dig(:current_user, :username),
current_user: true,
+ iid: issuable_sidebar[:iid],
+ issuable_type: issuable_type,
project_id: issuable_sidebar[:project_id],
author_id: issuable_sidebar[:author_id],
field_name: "#{issuable_type}[assignee_ids][]",