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
1f023789
Commit
1f023789
authored
Jun 27, 2019
by
Fabio Papa
Committed by
Imre Farkas
Jul 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add "allowed to create subgroups" dropdown to group settings form
parent
d3c037e6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
0 deletions
+11
-0
app/views/groups/settings/_permissions.html.haml
app/views/groups/settings/_permissions.html.haml
+1
-0
app/views/groups/settings/_subgroup_creation_level.html.haml
app/views/groups/settings/_subgroup_creation_level.html.haml
+3
-0
lib/gitlab/access.rb
lib/gitlab/access.rb
+7
-0
No files found.
app/views/groups/settings/_permissions.html.haml
View file @
1f023789
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
=
render_if_exists
'groups/settings/ip_restriction'
,
f:
f
,
group:
@group
=
render_if_exists
'groups/settings/ip_restriction'
,
f:
f
,
group:
@group
=
render
'groups/settings/lfs'
,
f:
f
=
render
'groups/settings/lfs'
,
f:
f
=
render
'groups/settings/project_creation_level'
,
f:
f
,
group:
@group
=
render
'groups/settings/project_creation_level'
,
f:
f
,
group:
@group
=
render
'groups/settings/subgroup_creation_level'
,
f:
f
,
group:
@group
=
render
'groups/settings/two_factor_auth'
,
f:
f
=
render
'groups/settings/two_factor_auth'
,
f:
f
=
render_if_exists
'groups/member_lock_setting'
,
f:
f
,
group:
@group
=
render_if_exists
'groups/member_lock_setting'
,
f:
f
,
group:
@group
...
...
app/views/groups/settings/_subgroup_creation_level.html.haml
0 → 100644
View file @
1f023789
.form-group
=
f
.
label
s_
(
'SubgroupCreationLevel|Allowed to create subgroups'
),
class:
'label-bold'
=
f
.
select
:subgroup_creation_level
,
options_for_select
(
::
Gitlab
::
Access
.
subgroup_creation_options
,
group
.
subgroup_creation_level
),
{},
class:
'form-control'
lib/gitlab/access.rb
View file @
1f023789
...
@@ -110,6 +110,13 @@ module Gitlab
...
@@ -110,6 +110,13 @@ module Gitlab
def
project_creation_level_name
(
name
)
def
project_creation_level_name
(
name
)
project_creation_options
.
key
(
name
)
project_creation_options
.
key
(
name
)
end
end
def
subgroup_creation_options
{
s_
(
'SubgroupCreationlevel|Owners'
)
=>
OWNER_SUBGROUP_ACCESS
,
s_
(
'SubgroupCreationlevel|Maintainers'
)
=>
MAINTAINER_SUBGROUP_ACCESS
}
end
end
end
def
human_access
def
human_access
...
...
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