From 38b39c50473ba58a80ddad5c22c96ccd5128ddfb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 5 Jun 2020 12:08:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/shared/issuable/_sidebar_assignees.html.haml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml index 4192ecd2238..adf2760329d 100644 --- a/app/views/shared/issuable/_sidebar_assignees.html.haml +++ b/app/views/shared/issuable/_sidebar_assignees.html.haml @@ -40,4 +40,13 @@ - data['max-select'] = dropdown_options[:data][:'max-select'] if dropdown_options[:data][:'max-select'] - options[:data].merge!(data) - = dropdown_tag(title, options: options) + - if experiment_enabled?(:invite_members_version_a) && can_import_members? + - options[:dropdown_class] += ' dropdown-extended-height' + - options[:footer_content] = true + + = dropdown_tag(title, options: options) do + %ul.dropdown-footer-list + %li + = link_to _('Invite Members'), project_project_members_path(@project), title: _('Invite Members'), :"data-is-link" => true + - else + = dropdown_tag(title, options: options) -- cgit v1.2.1