diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-06 18:51:02 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-12 15:55:01 +0100 |
| commit | 4025c7f099c6ad4de832567443dce4e39d543e76 (patch) | |
| tree | 6250e59ed228f9882a673a3672bd4b95d7e66060 | |
| parent | 4deab9a5406cadcdb16870f81dea1a6f41787af3 (diff) | |
| download | gitlab-ce-4025c7f099c6ad4de832567443dce4e39d543e76.tar.gz | |
fixes more issues for MR acceptance
| -rw-r--r-- | app/models/repository.rb | 16 | ||||
| -rw-r--r-- | app/services/files/update_service.rb | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 5f5634aafa2..affd21de924 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -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 @@ -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 diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index aaac3da9355..8d2b5083179 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -7,8 +7,6 @@ module Files branch: @target_branch, previous_path: @previous_path, message: @commit_message) - - end end end |