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
5c713f73
Commit
5c713f73
authored
Sep 11, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix conflict reoslution for groups/create_service.rb
parent
ae10e20f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
10 deletions
+0
-10
app/services/groups/create_service.rb
app/services/groups/create_service.rb
+0
-10
No files found.
app/services/groups/create_service.rb
View file @
5c713f73
...
...
@@ -8,20 +8,10 @@ module Groups
def
execute
@group
=
Group
.
new
(
params
)
unless
Gitlab
::
VisibilityLevel
.
allowed_for?
(
current_user
,
params
[
:visibility_level
])
deny_visibility_level
(
@group
)
return
@group
end
# Repository size limit comes as MB from the view
limit
=
params
.
delete
(
:repository_size_limit
)
@group
.
repository_size_limit
=
Gitlab
::
Utils
.
try_megabytes_to_bytes
(
limit
)
if
limit
if
@group
.
parent
&&
!
can?
(
current_user
,
:create_subgroup
,
@group
.
parent
)
@group
.
parent
=
nil
@group
.
errors
.
add
(
:parent_id
,
'You don’t have permission to create a subgroup in this group.'
)
end
unless
can_use_visibility_level?
&&
can_create_group?
return
@group
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