diff options
author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-19 15:27:29 +0100 |
---|---|---|
committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-19 15:27:29 +0100 |
commit | ff059360587f61907fb0a2691984ddd05fe049b9 (patch) | |
tree | 4649f5dce8ea7160a4c3b31110ed70eca39c1425 | |
parent | 5c69043e7534fdb04d62b7e1f7efe72de9b33b5e (diff) | |
download | gitlab-ce-ff059360587f61907fb0a2691984ddd05fe049b9.tar.gz |
fixes an issue cause by a bad merge
-rw-r--r-- | app/models/repository.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 48a68b44975..1a2ac90da51 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -741,7 +741,8 @@ class Repository options[:author] = committer options[:commit] = { message: message, - branch: ref + branch: ref, + update_ref: false } options[:file] = { |