diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-10 19:01:44 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-10 19:01:44 +0000 |
| commit | 51998fddcaafdb2c09dc456b877e1ceb709cd17d (patch) | |
| tree | c2fa46c9aba0c067b2d5676c6e3e3d050fdc241c /app/models | |
| parent | 5f07e13b7d04aad6e9a84c964a9239de0604b20a (diff) | |
| parent | b62cdc3c479365b2c96400c44b5e31eeb3d0c204 (diff) | |
| download | gitlab-ce-51998fddcaafdb2c09dc456b877e1ceb709cd17d.tar.gz | |
Merge branch 'cwq1913/gitlab-ce-fix_skip_merge_commits' into 'master'
Actually use the `skip_merges` option in Repository#commits
Originally opened at !2067 by @cwq1913.
See merge request !2750
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 0e17d2b669a..7f0047a002e 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -84,7 +84,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) |