diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities/invitation.rb | 3 | ||||
| -rw-r--r-- | lib/api/helpers/members_helpers.rb | 11 | ||||
| -rw-r--r-- | lib/api/invitations.rb | 19 | ||||
| -rw-r--r-- | lib/gitlab/current_settings.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 1 |
5 files changed, 35 insertions, 3 deletions
diff --git a/lib/api/entities/invitation.rb b/lib/api/entities/invitation.rb index 6698326bd6c..342f4804cf3 100644 --- a/lib/api/entities/invitation.rb +++ b/lib/api/entities/invitation.rb @@ -8,7 +8,8 @@ module API expose :expires_at expose :invite_email expose :invite_token - expose :user_id + expose :user_name, if: -> (member, _) { member.user.present? } + expose :created_by_name end end end diff --git a/lib/api/helpers/members_helpers.rb b/lib/api/helpers/members_helpers.rb index cdc0893a2e7..431001c227d 100644 --- a/lib/api/helpers/members_helpers.rb +++ b/lib/api/helpers/members_helpers.rb @@ -27,6 +27,13 @@ module API members end + def retrieve_member_invitations(source, query = nil) + members = source_members(source).where.not(invite_token: nil) + members = members.includes(:user) + members = members.where(invite_email: query) if query.present? + members + end + def source_members(source) source.members end @@ -52,6 +59,10 @@ module API def present_members(members) present members, with: Entities::Member, current_user: current_user, show_seat_info: params[:show_seat_info] end + + def present_member_invitations(invitations) + present invitations, with: Entities::Invitation, current_user: current_user + end end end end diff --git a/lib/api/invitations.rb b/lib/api/invitations.rb index 4485278286b..be8147908e9 100644 --- a/lib/api/invitations.rb +++ b/lib/api/invitations.rb @@ -2,6 +2,8 @@ module API class Invitations < ::API::Base + include PaginationParams + feature_category :users before { authenticate! } @@ -29,6 +31,23 @@ module API ::Members::InviteService.new(current_user, params).execute(source) end + + desc 'Get a list of group or project invitations viewable by the authenticated user' do + detail 'This feature was introduced in GitLab 13.6' + success Entities::Invitation + end + params do + optional :query, type: String, desc: 'A query string to search for members' + use :pagination + end + get ":id/invitations" do + source = find_source(source_type, params[:id]) + query = params[:query] + + invitations = paginate(retrieve_member_invitations(source, query)) + + present_member_invitations invitations + end end end end diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 2b08d3c63bb..d0579a44219 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -16,8 +16,8 @@ module Gitlab @in_memory_application_settings = nil end - def method_missing(name, *args, &block) - current_application_settings.send(name, *args, &block) # rubocop:disable GitlabSecurity/PublicSend + def method_missing(name, *args, **kwargs, &block) + current_application_settings.send(name, *args, **kwargs, &block) # rubocop:disable GitlabSecurity/PublicSend end def respond_to_missing?(name, include_private = false) diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index 308491c36d0..2d41ad76618 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -28,6 +28,7 @@ module Gitlab gon.sprite_icons = IconsHelper.sprite_icon_path gon.sprite_file_icons = IconsHelper.sprite_file_icons_path gon.emoji_sprites_css_path = ActionController::Base.helpers.stylesheet_path('emoji_sprites') + gon.select2_css_path = ActionController::Base.helpers.stylesheet_path('lazy_bundles/select2.css') gon.test_env = Rails.env.test? gon.disable_animations = Gitlab.config.gitlab['disable_animations'] gon.suggested_label_colors = LabelsHelper.suggested_colors |