Skip to content
Snippets Groups Projects
Commit 4025c7f0 authored by tiagonbotelho's avatar tiagonbotelho
Browse files

fixes more issues for MR acceptance

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