summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-04-02 00:45:07 -0700
committerStan Hu <stanhu@gmail.com>2016-04-02 00:45:07 -0700
commitb43e0597488d1beff0ed8510f56dbebb38382152 (patch)
tree842c8297f6de79e0f87546907add728cbe01efa6
parent82539cff700931532b22b6a8e3d6832137fc5d55 (diff)
downloadgitlab-ce-b43e0597488d1beff0ed8510f56dbebb38382152.tar.gz
Don't fetch any tags from a forked repo
Closes #13957
-rw-r--r--CHANGELOG1
-rw-r--r--app/models/repository.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5f73570650b..32ca386630d 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