Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-10 17:52:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-10 17:52:44 +0300
commit86a8eee1b8bd43a1fe962905eb97a1f478cc050b (patch)
tree439816bbaf4a0caf16d579223eb9465e0b0daebc /app/helpers
parent1b517a5a19c4aafc6fa6d738b0ee7c1e4a2cce36 (diff)
Add latest changes from gitlab-org/gitlab@13-6-stable-ee
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/members_helper.rb6
1 files changed, 3 insertions, 3 deletions
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"