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
4f1a16ac
Commit
4f1a16ac
authored
Feb 02, 2018
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't show Member Lock setting for unlicensed system
parent
9a6cac5e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
53 additions
and
8 deletions
+53
-8
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+1
-8
changelogs/unreleased-ee/3225-require-license-for-member-lock-setting.yml
...eased-ee/3225-require-license-for-member-lock-setting.yml
+5
-0
ee/app/models/license.rb
ee/app/models/license.rb
+1
-0
ee/app/views/groups/_member_lock_setting.html.haml
ee/app/views/groups/_member_lock_setting.html.haml
+10
-0
spec/ee/spec/features/groups/group_settings_spec.rb
spec/ee/spec/features/groups/group_settings_spec.rb
+36
-0
No files found.
app/views/groups/edit.html.haml
View file @
4f1a16ac
...
...
@@ -44,14 +44,7 @@
=
render
'group_admin_settings'
,
f:
f
.form-group
%hr
=
f
.
label
:membership_lock
,
class:
'control-label'
do
Member lock
.col-sm-10
.checkbox
=
f
.
check_box
:membership_lock
%span
.descr
Prevent adding new members to project membership within this group
=
render
'member_lock_setting'
,
f:
f
,
group:
@group
.form-actions
=
f
.
submit
'Save group'
,
class:
"btn btn-save"
...
...
changelogs/unreleased-ee/3225-require-license-for-member-lock-setting.yml
0 → 100644
View file @
4f1a16ac
---
title
:
Don't show Member Lock setting for unlicensed system
merge_request
:
4355
author
:
type
:
fixed
ee/app/models/license.rb
View file @
4f1a16ac
...
...
@@ -18,6 +18,7 @@ class License < ActiveRecord::Base
issue_weights
jenkins_integration
ldap_group_sync
member_lock
merge_request_approvers
merge_request_squash
multiple_ldap_servers
...
...
ee/app/views/groups/_member_lock_setting.html.haml
0 → 100644
View file @
4f1a16ac
-
return
unless
can?
(
current_user
,
:admin_group
,
group
)
&&
License
.
feature_available?
(
:member_lock
)
.form-group
%hr
=
f
.
label
:membership_lock
,
class:
'control-label'
do
Member lock
.col-sm-10
.checkbox
=
f
.
check_box
:membership_lock
%span
.descr
Prevent adding new members to project membership within this group
spec/ee/spec/features/groups/group_settings_spec.rb
View file @
4f1a16ac
...
...
@@ -2,10 +2,12 @@ require 'spec_helper'
feature
'Edit group settings'
do
given
(
:user
)
{
create
(
:user
)
}
given
(
:developer
)
{
create
(
:user
)
}
given
(
:group
)
{
create
(
:group
,
path:
'foo'
)
}
background
do
group
.
add_owner
(
user
)
group
.
add_developer
(
developer
)
sign_in
(
user
)
end
...
...
@@ -52,4 +54,38 @@ feature 'Edit group settings' do
expect
(
page
).
not_to
have_content
(
'Allowed to create projects'
)
end
end
describe
'Member Lock setting'
do
context
'without a license key'
do
before
do
License
.
delete_all
end
it
'is not visible'
do
visit
edit_group_path
(
group
)
expect
(
page
).
not_to
have_content
(
'Member lock'
)
end
end
context
'with a license key'
do
it
'is visible'
do
visit
edit_group_path
(
group
)
expect
(
page
).
to
have_content
(
'Member lock'
)
end
context
'when current user is not the Owner'
do
before
do
sign_in
(
developer
)
end
it
'is not visible'
do
visit
edit_group_path
(
group
)
expect
(
page
).
not_to
have_content
(
'Member lock'
)
end
end
end
end
end
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