diff options
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r-- | app/models/repository.rb | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 16988f6df3d..58ceed6aa3d 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -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, - branch: ref, + 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 commit_options[:previous_path] + commit_options[:file].merge!(previous_path: commit_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 |