Commit 41fc3257 authored by Aleksei Lipniagov's avatar Aleksei Lipniagov

Merge branch '333064-add-pending-members-page-route' into 'master'

Add pending_members route

See merge request gitlab-org/gitlab!75413
parents 46ba01c6 3d2a3403
...@@ -17,6 +17,11 @@ class Groups::UsageQuotasController < Groups::ApplicationController ...@@ -17,6 +17,11 @@ class Groups::UsageQuotasController < Groups::ApplicationController
@projects = @group.all_projects.with_shared_runners.page(params[:page]) @projects = @group.all_projects.with_shared_runners.page(params[:page])
end end
def pending_members
render_404 unless ::Feature.enabled?(:saas_user_caps, @group.root_ancestor, default_enabled: :yaml)
@hide_search_settings = true
end
private private
def verify_usage_quotas_enabled! def verify_usage_quotas_enabled!
......
- page_title s_("UsageQuota|Pending Members")
%h3.page-title
= s_('UsageQuota|Pending Members')
#js-pending-members-app{ data: { } }
...@@ -82,7 +82,11 @@ constraints(::Constraints::GroupUrlConstrainer.new) do ...@@ -82,7 +82,11 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
resources :ldap_group_links, only: [:index, :create, :destroy] resources :ldap_group_links, only: [:index, :create, :destroy]
resources :saml_group_links, only: [:index, :create, :destroy] resources :saml_group_links, only: [:index, :create, :destroy]
resources :audit_events, only: [:index] resources :audit_events, only: [:index]
resources :usage_quotas, only: [:index] resources :usage_quotas, only: [:index] do
collection do
get :pending_members
end
end
resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do
member do member do
......
...@@ -37493,6 +37493,9 @@ msgstr "" ...@@ -37493,6 +37493,9 @@ msgstr ""
msgid "UsageQuota|Packages" msgid "UsageQuota|Packages"
msgstr "" msgstr ""
msgid "UsageQuota|Pending Members"
msgstr ""
msgid "UsageQuota|Pipeline artifacts and job artifacts, created with CI/CD." msgid "UsageQuota|Pipeline artifacts and job artifacts, created with CI/CD."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment