diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-04-22 14:07:25 +0200 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-04-29 09:26:52 +0200 |
| commit | c4b9bd041321df25764ad1de90f89b1f0dda9f33 (patch) | |
| tree | 2517d2fdcf07838902a7eb7fedb788bcc5fa786d /spec/models | |
| parent | a792427eed95570da22844a06a09227730443189 (diff) | |
| download | gitlab-ce-c4b9bd041321df25764ad1de90f89b1f0dda9f33.tar.gz | |
API support for the 'since' and 'until' operators on commit requests
- Parameter validation as ISO8601 format
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/repository_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index a306cc4aef8..802b4e579e1 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -561,7 +561,7 @@ describe Repository, models: true do end describe :skip_merged_commit do - subject { repository.commits(Gitlab::Git::BRANCH_REF_PREFIX + "'test'", nil, 100, 0, true).map{ |k| k.id } } + subject { repository.commits(Gitlab::Git::BRANCH_REF_PREFIX + "'test'", limit: 100, skip_merges: true).map{ |k| k.id } } it { is_expected.not_to include('e56497bb5f03a90a51293fc6d516788730953899') } end |