diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-16 14:35:48 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-23 19:06:00 +0100 |
| commit | 3eb0354061b6c2ad39c90c9a3e9a5afa62e7685f (patch) | |
| tree | 01147e7de1e4c50834c62aef7369782d2f8ad2a2 /app | |
| parent | 43fa9c1f1a40903f6416b954c326d67259c7290a (diff) | |
| download | gitlab-ce-3eb0354061b6c2ad39c90c9a3e9a5afa62e7685f.tar.gz | |
Make Git history follow renames again by performing the --skip in Ruby
This hack is needed because of an issue when --follow and --skip
are passed to git log at the same time.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/23062
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index cd2568ad445..d7668cbd131 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -109,9 +109,7 @@ class Repository offset: offset, after: after, before: before, - # --follow doesn't play well with --skip. See: - # https://gitlab.com/gitlab-org/gitlab-ce/issues/3574#note_3040520 - follow: false, + follow: path.present?, skip_merges: skip_merges } |