summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-06-14 13:01:55 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-06-19 10:37:51 +0200
commitc24e39ab88af8fa3087efa0c7c6335e2941d8641 (patch)
treee5239419080085aae9dcbdc96c308a4d28167088 /spec/lib/gitlab
parent0716e19271ec8234b06164bf701a33c16bd221de (diff)
downloadgitlab-ce-c24e39ab88af8fa3087efa0c7c6335e2941d8641.tar.gz
Counting commits is done by Gitalyzj-counting-commits
Closes https://gitlab.com/gitlab-org/gitaly/issues/382
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r--spec/lib/gitlab/git/repository_spec.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index 5bae99101e6..b9eb002df3b 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -1114,7 +1114,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
end
describe '#count_commits' do
- shared_examples 'extended commit counting' do
+ describe 'extended commit counting' do
context 'with after timestamp' do
it 'returns the number of commits after timestamp' do
options = { ref: 'master', after: Time.iso8601('2013-03-03T20:15:01+00:00') }
@@ -1199,14 +1199,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
end
end
end
-
- context 'when Gitaly count_commits feature is enabled' do
- it_behaves_like 'extended commit counting'
- end
-
- context 'when Gitaly count_commits feature is disabled', :disable_gitaly do
- it_behaves_like 'extended commit counting'
- end
end
describe '#autocrlf' do