Commit 1f105bdc authored by tiagonbotelho's avatar tiagonbotelho

fixes more issues for MR acceptance

parent fc747dc3
......@@ -731,29 +731,29 @@ class Repository
end
end
def update_file(user, path, content, branch, options={})
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: options[:update]
update: true
}
if options[:previous_path]
commit_options[:file][:previous_path] = options[:previous_path]
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
......
......@@ -4,8 +4,9 @@ module Files
class UpdateService < Files::BaseService
def commit
repository.update_file(current_user, @file_path, @file_content,
@target_branch, previous_path: @previous_path,
message: @commit_message, update: true)
branch: @target_branch,
previous_path: @previous_path,
message: @commit_message)
end
end
end
......@@ -4,8 +4,8 @@
= icon('code-fork')
= ref
%span.editor-file-name
-if current_action?(:edit) || current_action?(:update)
= text_field_tag 'file_name', (params[:file_name] or @path),
- if current_action?(:edit) || current_action?(:update)
= text_field_tag 'file_name', (params[:file_name] || @path),
class: 'form-control new-file-name'
- if current_action?(:new) || current_action?(:create)
......
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