Merge branch 'rs-projects-update-service-parity-ee' into 'master'

Bring CE-EE parity to app/services/projects/update_service.rb

See merge request gitlab-org/gitlab-ee!5825

app/services/projects/update_service.rb

@@ -5,18 +5,10 @@ module Projects
     prepend ::EE::Projects::UpdateService
 
     def execute
-      # Repository size limit comes as MB from the view
-      limit = params.delete(:repository_size_limit)
-      project.repository_size_limit = Gitlab::Utils.try_megabytes_to_bytes(limit) if limit
-
       unless valid_visibility_level_change?(project, params[:visibility_level])
         return error('New visibility level not allowed!')
       end
 
-      if changing_storage_size?
-        project.change_repository_storage(params.delete(:repository_storage))
-      end
-
       if renaming_project_with_container_registry_tags?
         return error('Cannot rename project because it contains container registry tags!')
       end
@@ -27,6 +19,8 @@ module Projects
 
       ensure_wiki_exists if enabling_wiki?
 
+      yield if block_given?
+
       if project.update_attributes(params.except(:default_branch))
         if project.previous_changes.include?('path')
           project.rename_repo

ee/app/services/ee/projects/update_service.rb

@@ -16,7 +16,15 @@ module EE
         should_remove_old_approvers = params.delete(:remove_old_approvers)
         wiki_was_enabled = project.wiki_enabled?
 
-        result = super
+        limit = params.delete(:repository_size_limit)
+        result = super do
+          # 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
+        end
 
         if result[:status] == :success
           cleanup_approvers(project) if should_remove_old_approvers