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 /spec | |
| 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 'spec')
| -rw-r--r-- | spec/models/repository_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
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 |