diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-04-03 12:17:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-04 10:59:27 +0200 |
| commit | 59b6a137b051b46c4e383d88c4798bfc9bb684e8 (patch) | |
| tree | e8ce8221bc67256555d2ff4d224a3cc287b66278 | |
| parent | e5fed077c824c7ce7067a623d341983a48225d06 (diff) | |
| download | gitlab-ce-59b6a137b051b46c4e383d88c4798bfc9bb684e8.tar.gz | |
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 | 19 | ||||
| -rw-r--r-- | app/models/repository.rb | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index e121649a4de..97ba13fa647 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,24 @@ 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 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) + - Expose label description in API (Mariusz Jachimowicz) + - Allow back dating on issues when created through the API + - Fix avatar stretching by providing a cropping feature + - Add links to CI setup documentation from project settings and builds pages + - Handle nil descriptions in Slack issue messages (Stan Hu) + - Add default scope to projects to exclude projects pending deletion + - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.) + - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.) + - Gracefully handle notes on deleted commits in merge requests (Stan Hu) + - Fall back to `In-Reply-To` and `References` headers when sub-addressing is not available (David Padilla) + - Remove "Congratulations!" tweet button on newly-created project. (Connor Shea) + +v 8.6.4 + - Don't attempt to fetch any tags from a forked repo (Stan Hu) + v 8.6.3 - Mentions on confidential issues doesn't create todos for non-members. !3374 - Destroy related todos when an Issue/MR is deleted. !3376 diff --git a/app/models/repository.rb b/app/models/repository.rb index 908d765fb47..ba526b7d784 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -818,7 +818,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 |