Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
12c089a4
Commit
12c089a4
authored
Dec 08, 2021
by
Ammar Alakkad
Committed by
Douglas Barbosa Alexandre
Dec 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update user cap banner link
parent
9618f99c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/views/shared/_namespace_user_cap_reached_alert.html.haml
.../views/shared/_namespace_user_cap_reached_alert.html.haml
+1
-1
ee/spec/views/shared/_namespace_user_cap_reached_alert.html.haml_spec.rb
...hared/_namespace_user_cap_reached_alert.html.haml_spec.rb
+3
-3
No files found.
ee/app/views/shared/_namespace_user_cap_reached_alert.html.haml
View file @
12c089a4
...
...
@@ -4,7 +4,7 @@
-
return
unless
display_namespace_user_cap_reached_alert?
(
namespace
)
-
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">'
-
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'
)
}
...
...
ee/spec/views/shared/_namespace_user_cap_reached_alert.html.haml_spec.rb
View file @
12c089a4
...
...
@@ -29,7 +29,7 @@ RSpec.describe 'shared/namespace_user_cap_reached_alert', :use_clean_rails_memor
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
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
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
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
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
def
stub_cache
(
group
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment