BigW Consortium Gitlab

Use linguist from rubygems

parent 39754348
......@@ -29,7 +29,7 @@ gem 'omniauth-github'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
gem "gitlab_git", "~> 4.1.0"
gem "gitlab_git", "~> 5.0.0"
# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
......@@ -41,7 +41,7 @@ gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
gem "gitlab-gollum-lib", "~> 1.1.0", require: 'gollum-lib'
# Language detection
gem "gitlab-linguist", "~> 2.9.6", require: "linguist", git: 'https://gitlab.com/gitlab-org/linguist.git', ref: 'b337f7013333863503a8a7894cceb568478fda66'
gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
# API
gem "grape", "~> 0.6.1"
......
......@@ -5,16 +5,6 @@ GIT
specs:
github-markup (0.7.6)
GIT
remote: https://gitlab.com/gitlab-org/linguist.git
revision: b337f7013333863503a8a7894cceb568478fda66
ref: b337f7013333863503a8a7894cceb568478fda66
specs:
gitlab-linguist (2.9.6)
charlock_holmes (~> 0.6.6)
escape_utils (~> 0.2.4)
mime-types (~> 1.19)
GEM
remote: https://rubygems.org/
specs:
......@@ -182,10 +172,14 @@ GEM
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
gitlab_git (4.1.0)
gitlab-linguist (3.0.0)
charlock_holmes (~> 0.6.6)
escape_utils (~> 0.2.4)
mime-types (~> 1.19)
gitlab_git (5.0.0)
activesupport (~> 4.0.0)
gitlab-grit (~> 2.6.1)
gitlab-linguist (~> 2.9.5)
gitlab-linguist (~> 3.0.0)
gitlab_meta (6.0)
gitlab_omniauth-ldap (1.0.3)
net-ldap (~> 0.3.1)
......@@ -579,8 +573,8 @@ DEPENDENCIES
gitlab-flowdock-git-hook (~> 0.4.2)
gitlab-gollum-lib (~> 1.1.0)
gitlab-grack (~> 2.0.0.pre)
gitlab-linguist (~> 2.9.6)!
gitlab_git (~> 4.1.0)
gitlab-linguist (~> 3.0.0)
gitlab_git (~> 5.0.0)
gitlab_meta (= 6.0)
gitlab_omniauth-ldap (= 1.0.3)
gon (~> 5.0.0)
......
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