Skip to content
Snippets Groups Projects
Commit 0173b65d authored by tiagonbotelho's avatar tiagonbotelho
Browse files

refactors to pass values as arguments through options

parent a00d574a
No related branches found
No related tags found
1 merge request!5049Implements the form for renaming the new filename on the file edit page
Loading
Loading
@@ -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,
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
Loading
Loading
Loading
Loading
@@ -4,7 +4,9 @@ module Files
class UpdateService < Files::BaseService
def commit
# Need to update file_path with the new filename
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment