Commit 33ceed91 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch '344470-update-user-caps-banner-link' into 'master'

Update user cap banner link

See merge request gitlab-org/gitlab!76347
parents 7d1d1a8d 12c089a4
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- return unless display_namespace_user_cap_reached_alert?(namespace) - return unless display_namespace_user_cap_reached_alert?(namespace)
- root_namespace = namespace.root_ancestor - root_namespace = namespace.root_ancestor
- pending_users_link = usage_quotas_path(root_namespace, anchor: 'seats-quota-tab') - pending_users_link = pending_members_group_usage_quotas_path(root_namespace)
- link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">' - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'
- user_caps_link_start = link_start.html_safe % { url: help_page_path('user/admin_area/settings/sign_up_restrictions', anchor: 'user-cap') } - user_caps_link_start = link_start.html_safe % { url: help_page_path('user/admin_area/settings/sign_up_restrictions', anchor: 'user-cap') }
- users_pending_approval_link_start = link_start.html_safe % { url: help_page_path('user/admin_area/moderate_users') } - users_pending_approval_link_start = link_start.html_safe % { url: help_page_path('user/admin_area/moderate_users') }
......
...@@ -29,7 +29,7 @@ RSpec.describe 'shared/namespace_user_cap_reached_alert', :use_clean_rails_memor ...@@ -29,7 +29,7 @@ RSpec.describe 'shared/namespace_user_cap_reached_alert', :use_clean_rails_memor
render partial render partial
expect(rendered).to have_link('View pending user approvals', href: usage_quotas_path(group, anchor: 'seats-quota-tab')) expect(rendered).to have_link('View pending user approvals', href: pending_members_group_usage_quotas_path(group))
end end
it 'renders a link to the root namespace pending user approvals' do it 'renders a link to the root namespace pending user approvals' do
...@@ -37,7 +37,7 @@ RSpec.describe 'shared/namespace_user_cap_reached_alert', :use_clean_rails_memor ...@@ -37,7 +37,7 @@ RSpec.describe 'shared/namespace_user_cap_reached_alert', :use_clean_rails_memor
render partial render partial
expect(rendered).to have_link('View pending user approvals', href: usage_quotas_path(group, anchor: 'seats-quota-tab')) expect(rendered).to have_link('View pending user approvals', href: pending_members_group_usage_quotas_path(group))
end end
it 'renders a link to the project namespace pending user approvals' do it 'renders a link to the project namespace pending user approvals' do
...@@ -46,7 +46,7 @@ RSpec.describe 'shared/namespace_user_cap_reached_alert', :use_clean_rails_memor ...@@ -46,7 +46,7 @@ RSpec.describe 'shared/namespace_user_cap_reached_alert', :use_clean_rails_memor
render partial render partial
expect(rendered).to have_link('View pending user approvals', href: usage_quotas_path(project.namespace, anchor: 'seats-quota-tab')) expect(rendered).to have_link('View pending user approvals', href: pending_members_group_usage_quotas_path(project.namespace))
end end
def stub_cache(group) def stub_cache(group)
......
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