Commit 4025c7f0 authored by tiagonbotelho's avatar tiagonbotelho

fixes more issues for MR acceptance

parent 4deab9a5
...@@ -734,15 +734,15 @@ class Repository ...@@ -734,15 +734,15 @@ class Repository
def update_file(user, path, content, branch:, previous_path:, message:) def update_file(user, path, content, branch:, previous_path:, message:)
commit_with_hooks(user, branch) do |ref| commit_with_hooks(user, branch) do |ref|
committer = user_to_committer(user) committer = user_to_committer(user)
commit_options = {} options = {}
commit_options[:committer] = committer options[:committer] = committer
commit_options[:author] = committer options[:author] = committer
commit_options[:commit] = { options[:commit] = {
message: options[:message], message: message,
branch: ref branch: ref
} }
commit_options[:file] = { options[:file] = {
content: content, content: content,
path: path, path: path,
update: true update: true
...@@ -750,9 +750,9 @@ class Repository ...@@ -750,9 +750,9 @@ class Repository
if previous_path if previous_path
options[:file][:previous_path] = previous_path options[:file][:previous_path] = previous_path
Gitlab::Git::Blob.rename(raw_repository, commit_options) Gitlab::Git::Blob.rename(raw_repository, options)
else else
Gitlab::Git::Blob.commit(raw_repository, commit_options) Gitlab::Git::Blob.commit(raw_repository, options)
end end
end end
end end
......
...@@ -7,8 +7,6 @@ module Files ...@@ -7,8 +7,6 @@ module Files
branch: @target_branch, branch: @target_branch,
previous_path: @previous_path, previous_path: @previous_path,
message: @commit_message) message: @commit_message)
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