diff options
| author | Tony Chu <cwq1913@163.com> | 2015-12-11 21:47:57 +0800 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-08 12:15:42 +0100 |
| commit | b62cdc3c479365b2c96400c44b5e31eeb3d0c204 (patch) | |
| tree | 0133b3a276d96deac3227999dee27221aea1c4db /app/models | |
| parent | bce482a59a235edf1607dab73dff88aba4300012 (diff) | |
| download | gitlab-ce-b62cdc3c479365b2c96400c44b5e31eeb3d0c204.tar.gz | |
Actually use the `skip_merges` option in Repository#commitscwq1913/gitlab-ce-fix_skip_merge_commits
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/repository.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index e813c946bc1..a5b8f556a58 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -78,7 +78,8 @@ class Repository offset: offset, # --follow doesn't play well with --skip. See: # https://gitlab.com/gitlab-org/gitlab-ce/issues/3574#note_3040520 - follow: false + follow: false, + skip_merges: skip_merges } commits = Gitlab::Git::Commit.where(options) |