From 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Feb 2021 10:34:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-9-stable-ee --- app/helpers/invite_members_helper.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'app/helpers/invite_members_helper.rb') diff --git a/app/helpers/invite_members_helper.rb b/app/helpers/invite_members_helper.rb index a643fea6d5a..889365e39de 100644 --- a/app/helpers/invite_members_helper.rb +++ b/app/helpers/invite_members_helper.rb @@ -3,10 +3,14 @@ module InviteMembersHelper include Gitlab::Utils::StrongMemoize - def invite_members_allowed?(group) + def can_invite_members_for_group?(group) Feature.enabled?(:invite_members_group_modal, group) && can?(current_user, :admin_group_member, group) end + def can_invite_members_for_project?(project) + Feature.enabled?(:invite_members_group_modal, project.group) && can_import_members? + end + def directly_invite_members? strong_memoize(:directly_invite_members) do experiment_enabled?(:invite_members_version_a) && can_import_members? @@ -27,8 +31,8 @@ module InviteMembersHelper link_to invite_members_url(form_model), data: { 'track-event': 'click_link', - 'track-label': tracking_label(current_user), - 'track-property': experiment_tracking_category_and_group(:invite_members_new_dropdown, subject: current_user) + 'track-label': tracking_label, + 'track-property': experiment_tracking_category_and_group(:invite_members_new_dropdown) } do invite_member_link_content end -- cgit v1.2.3