diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-04-03 12:17:43 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-04-03 12:17:43 +0000 |
| commit | 136267dd356a88e6db39ad1a15e858da7b3c7361 (patch) | |
| tree | f792b9050fd401b334860b3576ae4ea2814e7205 | |
| parent | 2ed6cd9e469ffcdb60f21d1738de1eff8c258432 (diff) | |
| parent | b43e0597488d1beff0ed8510f56dbebb38382152 (diff) | |
| download | gitlab-ce-136267dd356a88e6db39ad1a15e858da7b3c7361.tar.gz | |
Merge branch 'fix-bad-fetch' into 'master'
Don't fetch any tags from a forked repo
Closes #13957
See merge request !3504
| -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 75fddce0eda..f038654cfd2 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.7.0 (unreleased) + - Don't attempt to fetch any tags from a forked repo (Stan Hu) - Don't attempt to look up an avatar in repo if repo directory does not exist (Stan hu) - Preserve time notes/comments have been updated at when moving issue - Make HTTP(s) label consistent on clone bar (Stan Hu) diff --git a/app/models/repository.rb b/app/models/repository.rb index ff24b75dcd1..bf76de61148 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -820,7 +820,7 @@ class Repository end def fetch_ref(source_path, source_ref, target_ref) - args = %W(#{Gitlab.config.git.bin_path} fetch -f #{source_path} #{source_ref}:#{target_ref}) + args = %W(#{Gitlab.config.git.bin_path} fetch --no-tags -f #{source_path} #{source_ref}:#{target_ref}) Gitlab::Popen.popen(args, path_to_repo) end |