diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-04-03 15:17:43 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-05 17:11:46 +0300 |
| commit | d583ef6f6c68d588afb49ed164ae5910261365d2 (patch) | |
| tree | 48164f3663a9b5c30146ee7f9f2d5663d1c0cbe9 | |
| parent | 46bb47accfe4e4246a3ccd4bda1bbf6d180c6308 (diff) | |
Merge branch 'fix-bad-fetch' into 'master'
Don't fetch any tags from a forked repo
Closes #13957
See merge request !3504
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG | 18 | ||||
| -rw-r--r-- | app/models/repository.rb | 2 |
2 files changed, 3 insertions, 17 deletions
diff --git a/CHANGELOG b/CHANGELOG index bb7760bfcef..3bbaf66e37e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,21 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. -v 8.6.0 (unreleased) - - Contributions to forked projects are included in calendar - - Improve the formatting for the user page bio (Connor Shea) - - Fix issue when pushing to projects ending in .wiki - - Fix avatar stretching by providing a cropping feature (Johann Pardanaud) - - Don't load all of GitLab in mail_room - - Strip leading and trailing spaces in URL validator (evuez) - - Return empty array instead of 404 when commit has no statuses in commit status API - - Update documentation to reflect Guest role not being enforced on internal projects - - Allow search for logged out users - - Don't show Issues/MRs from archived projects in Groups view - - Increase the notes polling timeout over time (Roberto Dip) - - Add shortcut to toggle markdown preview (Florent Baldino) - - Show labels in dashboard and group milestone views - - Add main language of a project in the list of projects (Tiago Botelho) - - Add ability to show archived projects on dashboard, explore and group pages +v 8.5.9 + - Don't attempt to fetch any tags from a forked repo (Stan Hu). !3504 v 8.5.8 - Bump Git version requirement to 2.7.4 diff --git a/app/models/repository.rb b/app/models/repository.rb index e050bd45254..6b25793786b 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -709,7 +709,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 |