Merge branch 'zj-remove-linguist' into 'master'
Remove dependencies on Linguist Closes #35450 See merge request gitlab-org/gitlab-ce!21008
Showing
... | @@ -83,9 +83,6 @@ gem 'net-ldap' | ... | @@ -83,9 +83,6 @@ gem 'net-ldap' |
# Only used to compute wiki page slugs | # Only used to compute wiki page slugs | ||
gem 'gitlab-gollum-lib', '~> 4.2', require: false | gem 'gitlab-gollum-lib', '~> 4.2', require: false | ||
# Language detection | |||
gem 'github-linguist', '~> 5.3.3', require: 'linguist' | |||
# API | # API | ||
gem 'grape', '~> 1.1' | gem 'grape', '~> 1.1' | ||
gem 'grape-entity', '~> 0.7.1' | gem 'grape-entity', '~> 0.7.1' | ||
... | @@ -146,6 +143,7 @@ gem 'rouge', '~> 3.1' | ... | @@ -146,6 +143,7 @@ gem 'rouge', '~> 3.1' |
gem 'truncato', '~> 0.7.9' | gem 'truncato', '~> 0.7.9' | ||
gem 'bootstrap_form', '~> 2.7.0' | gem 'bootstrap_form', '~> 2.7.0' | ||
gem 'nokogiri', '~> 1.8.2' | gem 'nokogiri', '~> 1.8.2' | ||
gem 'escape_utils', '~> 1.1' | |||
# Calendar rendering | # Calendar rendering | ||
gem 'icalendar' | gem 'icalendar' | ||
... | ... |
lib/gitlab/blob_helper.rb
0 → 100644
lib/gitlab/language_data.rb
0 → 100644
vendor/languages.yml
0 → 100755
Please register or sign in to comment