diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-01-06 21:58:27 +0300 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-06 21:58:27 +0300 |
commit | 1fd8d300a3f3091300c99be1e498d02b53d76339 (patch) | |
tree | 859962295ce79c53ad6c8af8623eead5c24937de /app/services | |
parent | d13be3c2d98071234790e2fe11d180e8b7b13b6e (diff) | |
parent | 54bacb1860036ffcd722f7df033d7def6b1a8756 (diff) |
Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/files/multi_service.rb | 15 | ||||
-rw-r--r-- | app/services/reset_project_cache_service.rb | 5 |
2 files changed, 9 insertions, 11 deletions
diff --git a/app/services/files/multi_service.rb b/app/services/files/multi_service.rb index 98a3e83c130..a03c59f569d 100644 --- a/app/services/files/multi_service.rb +++ b/app/services/files/multi_service.rb @@ -4,7 +4,7 @@ module Files def create_commit! repository.multi_action( - user: current_user, + current_user, message: @commit_message, branch_name: @branch_name, actions: params[:actions], @@ -13,6 +13,8 @@ module Files start_project: @start_project, start_branch_name: @start_branch ) + rescue ArgumentError => e + raise_error(e) end private @@ -20,16 +22,7 @@ module Files def validate! super - params[:actions].each do |action| - validate_action!(action) - validate_file_status!(action) - end - end - - def validate_action!(action) - unless Gitlab::Git::Index::ACTIONS.include?(action[:action].to_s) - raise_error("Unknown action '#{action[:action]}'") - end + params[:actions].each { |action| validate_file_status!(action) } end def validate_file_status!(action) diff --git a/app/services/reset_project_cache_service.rb b/app/services/reset_project_cache_service.rb new file mode 100644 index 00000000000..a162a6eedb9 --- /dev/null +++ b/app/services/reset_project_cache_service.rb @@ -0,0 +1,5 @@ +class ResetProjectCacheService < BaseService + def execute + @project.increment!(:jobs_cache_index) + end +end |