diff options
author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-06 11:25:45 +0100 |
---|---|---|
committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-06 14:23:48 +0100 |
commit | 8df419cba35262b827b6d04870da1df3ed79b939 (patch) | |
tree | d083e93d51a2f4bd595211174700d9d987c659a6 | |
parent | c1c11fa7725443b6c00a45eac0e8ffc986b19a45 (diff) | |
download | gitlab-ce-8df419cba35262b827b6d04870da1df3ed79b939.tar.gz |
refactors to pass values as arguments through options
-rw-r--r-- | app/models/repository.rb | 27 | ||||
-rw-r--r-- | app/services/files/update_service.rb | 4 |
2 files changed, 17 insertions, 14 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 16988f6df3d..58ceed6aa3d 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -741,29 +741,30 @@ class Repository end end - def update_file(user, path, previous_path, content, message, branch, update) + # previous_path, message, update + def update_file(user, path, content, branch, options={}) commit_with_hooks(user, branch) do |ref| committer = user_to_committer(user) - options = {} - options[:committer] = committer - options[:author] = committer - options[:commit] = { - message: message, - branch: ref, + commit_options = {} + commit_options[:committer] = committer + commit_options[:author] = committer + commit_options[:commit] = { + message: options[:message], + branch: ref } - options[:file] = { + commit_options[:file] = { content: content, path: path, - update: update + update: options[:update] } - if previous_path - options[:file].merge!(previous_path: previous_path) + if commit_options[:previous_path] + commit_options[:file].merge!(previous_path: commit_options[:previous_path]) - Gitlab::Git::Blob.rename(raw_repository, options) + Gitlab::Git::Blob.rename(raw_repository, commit_options) else - Gitlab::Git::Blob.commit(raw_repository, options) + Gitlab::Git::Blob.commit(raw_repository, commit_options) end end end diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index fefa1d4ef68..905c7a7c81a 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -3,7 +3,9 @@ require_relative "base_service" module Files class UpdateService < Files::BaseService def commit - repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) + repository.update_file(current_user, @file_path, @file_content, + @target_branch, previous_path: @previous_path, + message: @commit_message, update: true) end end end |