diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /app/helpers/members_helper.rb | |
parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'app/helpers/members_helper.rb')
-rw-r--r-- | app/helpers/members_helper.rb | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index f1f5f941edd..29f94adcc78 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -14,19 +14,17 @@ module MembersHelper else "deny #{member.user.name}'s request to join" end + elsif member.user + "remove #{member.user.name} from" else - if member.user - "remove #{member.user.name} from" - else - e = RuntimeError.new("Data integrity error: no associated user for member ID #{member.id}") - Gitlab::ErrorTracking.track_exception(e, - member_id: member.id, - invite_email: member.invite_email, - invite_accepted_at: member.invite_accepted_at, - source_id: member.source_id, - source_type: member.source_type) - "remove this orphaned member from" - end + e = RuntimeError.new("Data integrity error: no associated user for member ID #{member.id}") + Gitlab::ErrorTracking.track_exception(e, + member_id: member.id, + invite_email: member.invite_email, + invite_accepted_at: member.invite_accepted_at, + source_id: member.source_id, + source_type: member.source_type) + "remove this orphaned member from" end "#{text} #{action} the #{member.source.human_name} #{source_text(member)}?" |