Commit f70c581d authored by Douwe Maan's avatar Douwe Maan

Merge branch 'zj-linguist-gitaly-mandatory' into 'master'

Move language detection to mandatory

Closes gitaly#732 and gitaly#360

See merge request gitlab-org/gitlab-ce!19985
parents 51334904 9ae8b574
...@@ -1688,7 +1688,6 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -1688,7 +1688,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
end end
describe '#languages' do describe '#languages' do
shared_examples 'languages' do
it 'returns exactly the expected results' do it 'returns exactly the expected results' do
languages = repository.languages('4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6') languages = repository.languages('4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6')
expected_languages = [ expected_languages = [
...@@ -1719,13 +1718,6 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -1719,13 +1718,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
end end
end end
it_behaves_like 'languages'
context 'with rugged', :skip_gitaly_mock do
it_behaves_like 'languages'
end
end
describe '#license_short_name' do describe '#license_short_name' do
subject { repository.license_short_name } subject { repository.license_short_name }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment