refactors to pass values as arguments through options
This commit is contained in:
parent
7503dc7fcf
commit
58031cadc8
2 changed files with 17 additions and 15 deletions
|
@ -731,29 +731,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 options[:previous_path]
|
||||
commit_options[:file].merge!(previous_path: 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
|
||||
|
|
|
@ -3,8 +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
|
||||
|
|
Loading…
Reference in a new issue