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
436ccfe7
Commit
436ccfe7
authored
Dec 15, 2021
by
Luke Stahlman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove validation check against licensed users
parent
98b97273
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
22 deletions
+1
-22
ee/app/models/ee/application_setting.rb
ee/app/models/ee/application_setting.rb
+1
-2
ee/spec/features/admin/admin_settings_spec.rb
ee/spec/features/admin/admin_settings_spec.rb
+0
-20
No files found.
ee/app/models/ee/application_setting.rb
View file @
436ccfe7
...
...
@@ -109,8 +109,7 @@ module EE
allow_blank:
true
,
numericality:
{
only_integer:
true
,
greater_than:
0
,
less_than_or_equal_to:
proc
{
License
.
current
&
.
restricted_user_count
}
greater_than:
0
},
if:
proc
{
License
.
current
&
.
restricted_user_count?
}
...
...
ee/spec/features/admin/admin_settings_spec.rb
View file @
436ccfe7
...
...
@@ -291,26 +291,6 @@ RSpec.describe 'Admin updates EE-only settings' do
visit
general_admin_application_settings_path
end
context
'when license has active user count'
do
let
(
:license
)
{
create
(
:license
,
restrictions:
{
active_user_count:
1
})
}
before
do
allow
(
License
).
to
receive
(
:current
).
and_return
(
license
)
end
it
'disallows entering user cap greater then license allows'
do
page
.
within
(
'#js-signup-settings'
)
do
fill_in
'application_setting[new_user_signups_cap]'
,
with:
5
click_button
'Save changes'
page
.
within
'#error_explanation'
do
expect
(
page
).
to
have_text
(
'New user signups cap must be less than or equal to 1'
)
end
end
end
end
it
'changes the user cap from unlimited to 5'
do
expect
(
current_settings
.
new_user_signups_cap
).
to
be_nil
...
...
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