Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

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)}?"