BigW Consortium Gitlab

Commit c84786c5 by tiagonbotelho

refactors to pass values as arguments through options

parent 5d32a960
...@@ -731,45 +731,30 @@ class Repository ...@@ -731,45 +731,30 @@ class Repository
end end
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| commit_with_hooks(user, branch) do |ref|
committer = user_to_committer(user) committer = user_to_committer(user)
options = {} commit_options = {}
options[:committer] = committer commit_options[:committer] = committer
options[:author] = committer commit_options[:author] = committer
options[:commit] = { commit_options[:commit] = {
message: message, message: options[:message],
<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945
branch: ref branch: ref
} }
======= commit_options[:file] = {
branch: ref,
}
if previous_path
options[:file] = {
path: previous_path
}
Gitlab::Git::Blob.remove(raw_repository, options)
end
>>>>>>> creates the update_file method in repository.rb and applies changes accordingly
options[:file] = {
content: content, content: content,
path: path, path: path,
update: update update: options[:update]
} }
<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945 if options[:previous_path]
if previous_path commit_options[:file].merge!(previous_path: options[:previous_path])
options[:file].merge!(previous_path: previous_path)
Gitlab::Git::Blob.rename(raw_repository, options) Gitlab::Git::Blob.rename(raw_repository, commit_options)
else else
Gitlab::Git::Blob.commit(raw_repository, options) Gitlab::Git::Blob.commit(raw_repository, commit_options)
end end
end end
end end
......
...@@ -3,7 +3,9 @@ require_relative "base_service" ...@@ -3,7 +3,9 @@ require_relative "base_service"
module Files module Files
class UpdateService < Files::BaseService class UpdateService < Files::BaseService
def commit 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 end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment