From 86a8eee1b8bd43a1fe962905eb97a1f478cc050b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 10 Dec 2020 14:52:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-6-stable-ee --- app/helpers/members_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index d66f67fbb60..5dc636ad996 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -6,14 +6,14 @@ module MembersHelper text = 'Are you sure you want to' action = - if member.request? + if member.invite? + "revoke the invitation for #{member.invite_email} to join" + elsif member.request? if member.user == user 'withdraw your access request for' else "deny #{member.user.name}'s request to join" end - elsif member.invite? - "revoke the invitation for #{member.invite_email} to join" else if member.user "remove #{member.user.name} from" -- cgit v1.2.3