Download as
Browse Code »

Commit 74f1da10d1e6923c347426de9603df7bd8919e09

Authored by Dmitriy Zaporozhets
1 parent 39754348
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Use linguist from rubygems 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 10 additions and 16 deletions   Show diff stats
Gemfile
  Diff comments   View file @74f1da1
... ... @@ -29,7 +29,7 @@ gem &#39;omniauth-github&#39;
29 29  
30 30 # Extracting information from a git repository
31 31 # Provide access to Gitlab::Git library
32   -gem "gitlab_git", "~> 4.1.0"
  32 +gem "gitlab_git", "~> 5.0.0"
33 33  
34 34 # Ruby/Rack Git Smart-HTTP Server Handler
35 35 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
... ... @@ -41,7 +41,7 @@ gem &#39;gitlab_omniauth-ldap&#39;, &#39;1.0.3&#39;, require: &quot;omniauth-ldap&quot;
41 41 gem "gitlab-gollum-lib", "~> 1.1.0", require: 'gollum-lib'
42 42  
43 43 # Language detection
44   -gem "gitlab-linguist", "~> 2.9.6", require: "linguist", git: 'https://gitlab.com/gitlab-org/linguist.git', ref: 'b337f7013333863503a8a7894cceb568478fda66'
  44 +gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
45 45  
46 46 # API
47 47 gem "grape", "~> 0.6.1"
... ...
Gemfile.lock
  Diff comments   View file @74f1da1
... ... @@ -5,16 +5,6 @@ GIT
5 5 specs:
6 6 github-markup (0.7.6)
7 7  
8   -GIT
9   - remote: https://gitlab.com/gitlab-org/linguist.git
10   - revision: b337f7013333863503a8a7894cceb568478fda66
11   - ref: b337f7013333863503a8a7894cceb568478fda66
12   - specs:
13   - gitlab-linguist (2.9.6)
14   - charlock_holmes (~> 0.6.6)
15   - escape_utils (~> 0.2.4)
16   - mime-types (~> 1.19)
17   -
18 8 GEM
19 9 remote: https://rubygems.org/
20 10 specs:
... ... @@ -182,10 +172,14 @@ GEM
182 172 diff-lcs (~> 1.1)
183 173 mime-types (~> 1.15)
184 174 posix-spawn (~> 0.3.6)
185   - gitlab_git (4.1.0)
  175 + gitlab-linguist (3.0.0)
  176 + charlock_holmes (~> 0.6.6)
  177 + escape_utils (~> 0.2.4)
  178 + mime-types (~> 1.19)
  179 + gitlab_git (5.0.0)
186 180 activesupport (~> 4.0.0)
187 181 gitlab-grit (~> 2.6.1)
188   - gitlab-linguist (~> 2.9.5)
  182 + gitlab-linguist (~> 3.0.0)
189 183 gitlab_meta (6.0)
190 184 gitlab_omniauth-ldap (1.0.3)
191 185 net-ldap (~> 0.3.1)
... ... @@ -579,8 +573,8 @@ DEPENDENCIES
579 573 gitlab-flowdock-git-hook (~> 0.4.2)
580 574 gitlab-gollum-lib (~> 1.1.0)
581 575 gitlab-grack (~> 2.0.0.pre)
582   - gitlab-linguist (~> 2.9.6)!
583   - gitlab_git (~> 4.1.0)
  576 + gitlab-linguist (~> 3.0.0)
  577 + gitlab_git (~> 5.0.0)
584 578 gitlab_meta (= 6.0)
585 579 gitlab_omniauth-ldap (= 1.0.3)
586 580 gon (~> 5.0.0)
... ...