root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2024-03-03 00:09:30 +00:00
parent f9a99cc7d5
commit d386877893
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/members/create_service.rb
View File

@ -5,6 +5,7 @@ module Members
BlankInvitesError = Class.new(StandardError) BlankInvitesError = Class.new(StandardError)
TooManyInvitesError = Class.new(StandardError) TooManyInvitesError = Class.new(StandardError)
MembershipLockedError = Class.new(StandardError) MembershipLockedError = Class.new(StandardError)
SeatLimitExceededError = Class.new(StandardError)
DEFAULT_INVITE_LIMIT = 100 DEFAULT_INVITE_LIMIT = 100
@ -37,13 +38,13 @@ module Members
publish_event! publish_event!
result 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) Gitlab::ErrorTracking.log_exception(e, class: self.class.to_s, user_id: current_user.id)
error(e.message) error(e.message)
end end
def single_member def single_member
members.last members&.last
end end
private private

2
lib/api/helpers/members_helpers.rb
View File

@ -101,7 +101,7 @@ module API
# prefer responding with model validations, if present # prefer responding with model validations, if present
member = instance.single_member 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, # if errors occurred besides model validations or authorization failures,
# render those appropriately # render those appropriately

3
locale/gitlab.pot
View File

@ -3094,6 +3094,9 @@ msgstr ""
msgid "AddMember|No users specified." msgid "AddMember|No users specified."
msgstr "" msgstr ""
msgid "AddMember|Not enough seats for this many users."
msgstr ""
msgid "AddMember|Too many users specified (limit is %{user_limit})" msgid "AddMember|Too many users specified (limit is %{user_limit})"
msgstr "" msgstr ""