From b62cdc3c479365b2c96400c44b5e31eeb3d0c204 Mon Sep 17 00:00:00 2001 From: Tony Chu Date: Fri, 11 Dec 2015 21:47:57 +0800 Subject: Actually use the `skip_merges` option in Repository#commits --- spec/models/repository_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec') 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 -- cgit v1.2.1