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 | |
| parent | bce482a59a235edf1607dab73dff88aba4300012 (diff) | |
| download | gitlab-ce-cwq1913/gitlab-ce-fix_skip_merge_commits.tar.gz | |
Actually use the `skip_merges` option in Repository#commitscwq1913/gitlab-ce-fix_skip_merge_commits
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/repository.rb | 3 | ||||
| -rw-r--r-- | spec/models/repository_spec.rb | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 50b27e25492..18ed8ff58cd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,7 @@ v 8.5.0 (unreleased) - Update the ExternalIssue regex pattern (Blake Hitchcock) - Optimized performance of finding issues to be closed by a merge request - Revert "Add IP check against DNSBLs at account sign-up" + - Actually use the `skip_merges` option in Repository#commits (Tony Chu) - Fix API to keep request parameters in Link header (Michael Potthoff) - Deprecate API "merge_request/:merge_request_id/comments". Use "merge_requests/:merge_request_id/notes" instead - Deprecate API "merge_request/:merge_request_id/...". Use "merge_requests/:merge_request_id/..." instead 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) diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index c484ae8fc8c..db86f7032c6 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -239,4 +239,10 @@ describe Repository, models: true do it { is_expected.to eq(true) } end end + + describe :skip_merged_commit do + subject { repository.commits(Gitlab::Git::BRANCH_REF_PREFIX + "'test'", nil, 100, 0, true).map{ |k| k.id } } + + it { is_expected.not_to include('e56497bb5f03a90a51293fc6d516788730953899') } + end end |