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

1 files changed, 10 insertions, 13 deletions

diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml
index 47e7ff0e4bc..86369b32e98 100644
--- a/app/views/shared/issuable/_sidebar_assignees.html.haml
+++ b/app/views/shared/issuable/_sidebar_assignees.html.haml
@@ -1,7 +1,10 @@
 - issuable_type = issuable_sidebar[:type]
 - dropdown_options = assignees_dropdown_options(issuable_type)
 
-#js-vue-sidebar-assignees{ data: { field: issuable_type, signed_in: signed_in, max_assignees: dropdown_options[:data][:"max-select"], directly_invite_members: directly_invite_members?, indirectly_invite_members: indirectly_invite_members? } }
+#js-vue-sidebar-assignees{ data: { field: issuable_type,
+  signed_in: signed_in,
+  max_assignees: dropdown_options[:data][:"max-select"],
+  directly_invite_members: directly_invite_members? } }
   .title.hide-collapsed
     = _('Assignee')
     = loading_icon(css_class: 'gl-vertical-align-text-bottom')
@@ -39,12 +42,12 @@
   - data['max-select'] = dropdown_options[:data][:'max-select'] if dropdown_options[:data][:'max-select']
   - options[:data].merge!(data)
 
-  - if directly_invite_members? || indirectly_invite_members?
+  - if directly_invite_members?
     - options[:dropdown_class] += ' dropdown-extended-height'
     - options[:footer_content] = true
     - options[:wrapper_class] = 'js-sidebar-assignee-dropdown'
     - options[:toggle_class] += ' js-invite-members-track'
-    - data['track-event'] = show_invite_members_track_event
+    - data['track-event'] = 'show_invite_members'
     - options[:data].merge!(data)
     - invite_text = _('Invite Members')
     - track_label = 'edit_assignee'
@@ -52,15 +55,9 @@
     = dropdown_tag(title, options: options) do
       %ul.dropdown-footer-list
         %li
-          - if directly_invite_members?
-            .js-invite-members-trigger{ data: { trigger_element: 'anchor',
-              display_text: invite_text,
-              event: 'click_invite_members',
-              label: track_label } }
-          - else
-            .js-invite-member-trigger{ data: { display_text: invite_text, event: 'click_invite_members_version_b', label: track_label } }
+          .js-invite-members-trigger{ data: { trigger_element: 'anchor',
+            display_text: invite_text,
+            event: 'click_invite_members',
+            label: track_label } }
   - else
     = dropdown_tag(title, options: options)
-
-- if indirectly_invite_members?
-  .js-invite-member-modal{ data: { members_path: project_project_members_path(@project, sort: :access_level_desc) } }