summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-04-03 12:17:43 +0000
committerDouwe Maan <douwe@gitlab.com>2016-04-03 12:17:43 +0000
commit136267dd356a88e6db39ad1a15e858da7b3c7361 (patch)
treef792b9050fd401b334860b3576ae4ea2814e7205 /app
parent2ed6cd9e469ffcdb60f21d1738de1eff8c258432 (diff)
parentb43e0597488d1beff0ed8510f56dbebb38382152 (diff)
downloadgitlab-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
Diffstat (limited to 'app')
-rw-r--r--app/models/repository.rb2
1 files changed, 1 insertions, 1 deletions
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