diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-10-23 11:13:10 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-10-29 00:10:25 +0100 |
| commit | f56c7d9f8e66c69de6e984e497dd529874b8d638 (patch) | |
| tree | 84794dac899b891930de34bbedb91ce947200bc3 | |
| parent | 8c9e1df98eb45e3305ab5badc6727580e84d36e0 (diff) | |
| download | gitlab-ce-f56c7d9f8e66c69de6e984e497dd529874b8d638.tar.gz | |
Force update refs/merge-requests/X/head upon a push to the source branch of a merge request
Closes #3138
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/repository.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0d89fca9fc1..fa13343ea2b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.2.0 (unreleased) + - Force update refs/merge-requests/X/head upon a push to the source branch of a merge request (Stan Hu) - Improved performance of replacing references in comments - Show last project commit to default branch on project home page - Highlight comment based on anchor in URL diff --git a/app/models/repository.rb b/app/models/repository.rb index a3ba5f4c18a..c9b36bd8170 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -528,7 +528,7 @@ class Repository end def fetch_ref(source_path, source_ref, target_ref) - args = %W(git fetch #{source_path} #{source_ref}:#{target_ref}) + args = %W(git fetch -f #{source_path} #{source_ref}:#{target_ref}) Gitlab::Popen.popen(args, path_to_repo) end |