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
d3c48793
Commit
d3c48793
authored
May 29, 2018
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorder size limit and storage size checks in Project update service
They're now performed after the `super`.
parent
a6e36672
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
ee/app/services/ee/projects/update_service.rb
ee/app/services/ee/projects/update_service.rb
+7
-7
No files found.
ee/app/services/ee/projects/update_service.rb
View file @
d3c48793
...
@@ -16,17 +16,17 @@ module EE
...
@@ -16,17 +16,17 @@ module EE
should_remove_old_approvers
=
params
.
delete
(
:remove_old_approvers
)
should_remove_old_approvers
=
params
.
delete
(
:remove_old_approvers
)
wiki_was_enabled
=
project
.
wiki_enabled?
wiki_was_enabled
=
project
.
wiki_enabled?
# Repository size limit comes as MB from the view
limit
=
params
.
delete
(
:repository_size_limit
)
limit
=
params
.
delete
(
:repository_size_limit
)
project
.
repository_size_limit
=
::
Gitlab
::
Utils
.
try_megabytes_to_bytes
(
limit
)
if
limit
if
changing_storage_size?
project
.
change_repository_storage
(
params
.
delete
(
:repository_storage
))
end
result
=
super
result
=
super
if
result
[
:status
]
==
:success
if
result
[
:status
]
==
:success
# Repository size limit comes as MB from the view
project
.
repository_size_limit
=
::
Gitlab
::
Utils
.
try_megabytes_to_bytes
(
limit
)
if
limit
if
changing_storage_size?
project
.
change_repository_storage
(
params
.
delete
(
:repository_storage
))
end
cleanup_approvers
(
project
)
if
should_remove_old_approvers
cleanup_approvers
(
project
)
if
should_remove_old_approvers
log_audit_events
log_audit_events
...
...
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