From d386877893481f1c5318f79bfdb4c943e7100958 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sun, 3 Mar 2024 00:09:30 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 app/services/members/create_service.rb | 5 +++--
 lib/api/helpers/members_helpers.rb     | 2 +-
 locale/gitlab.pot                      | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/services/members/create_service.rb b/app/services/members/create_service.rb
index ec9a4f9f4a6..b866ce79923 100644
--- a/app/services/members/create_service.rb
+++ b/app/services/members/create_service.rb
@@ -5,6 +5,7 @@ module Members
     BlankInvitesError = Class.new(StandardError)
     TooManyInvitesError = Class.new(StandardError)
     MembershipLockedError = Class.new(StandardError)
+    SeatLimitExceededError = Class.new(StandardError)
 
     DEFAULT_INVITE_LIMIT = 100
 
@@ -37,13 +38,13 @@ module Members
       publish_event!
 
       result
-    rescue BlankInvitesError, TooManyInvitesError, MembershipLockedError => e
+    rescue BlankInvitesError, TooManyInvitesError, MembershipLockedError, SeatLimitExceededError => e
       Gitlab::ErrorTracking.log_exception(e, class: self.class.to_s, user_id: current_user.id)
       error(e.message)
     end
 
     def single_member
-      members.last
+      members&.last
     end
 
     private
diff --git a/lib/api/helpers/members_helpers.rb b/lib/api/helpers/members_helpers.rb
index 6d1cd9d8cd9..128848ca47b 100644
--- a/lib/api/helpers/members_helpers.rb
+++ b/lib/api/helpers/members_helpers.rb
@@ -101,7 +101,7 @@ module API
 
         # prefer responding with model validations, if present
         member = instance.single_member
-        render_validation_error!(member) if member.invalid?
+        render_validation_error!(member) if member&.invalid?
 
         # if errors occurred besides model validations or authorization failures,
         # render those appropriately
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index f8a7729bbe2..33bf495bc60 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3094,6 +3094,9 @@ msgstr ""
 msgid "AddMember|No users specified."
 msgstr ""
 
+msgid "AddMember|Not enough seats for this many users."
+msgstr ""
+
 msgid "AddMember|Too many users specified (limit is %{user_limit})"
 msgstr ""