Download as
Browse Code »

Commit 152c6018b3ace729095e7b58f5be3963b81050fb

Authored by Dmitriy Zaporozhets
1 parent d199de04
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

use grit_ext gem instead of fork

Showing 2 changed files with 4 additions and 11 deletions   Show diff stats
@@ -23,12 +23,11 @@ gem 'omniauth-github' @@ -23,12 +23,11 @@ gem 'omniauth-github'
23 23
24 # Extracting information from a git repository 24 # Extracting information from a git repository
25 gem "gitlab-grit", '~> 1.0.0', require: 'grit' 25 gem "gitlab-grit", '~> 1.0.0', require: 'grit'
  26 +gem 'grit_ext', '~> 0.6.2'
26 27
27 # Ruby/Rack Git Smart-HTTP Server Handler 28 # Ruby/Rack Git Smart-HTTP Server Handler
28 gem 'gitlab-grack', '~> 1.0.0', require: 'grack' 29 gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
29 30
30 -gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '2d1b2f13cabc02520405985fccb2a0abfcba9907'  
31 -  
32 # LDAP Auth 31 # LDAP Auth
33 gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap" 32 gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
34 33
@@ -7,14 +7,6 @@ GIT @@ -7,14 +7,6 @@ GIT
7 rake (>= 0.8.7) 7 rake (>= 0.8.7)
8 8
9 GIT 9 GIT
10 - remote: https://github.com/gitlabhq/grit_ext.git  
11 - revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907  
12 - ref: 2d1b2f13cabc02520405985fccb2a0abfcba9907  
13 - specs:  
14 - grit_ext (0.6.2)  
15 - charlock_holmes (~> 0.6.9)  
16 -  
17 -GIT  
18 remote: https://github.com/gitlabhq/raphael-rails.git 10 remote: https://github.com/gitlabhq/raphael-rails.git
19 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58 11 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
20 specs: 12 specs:
@@ -178,6 +170,8 @@ GEM @@ -178,6 +170,8 @@ GEM
178 grape-entity (0.2.0) 170 grape-entity (0.2.0)
179 activesupport 171 activesupport
180 multi_json (>= 1.3.2) 172 multi_json (>= 1.3.2)
  173 + grit_ext (0.6.2)
  174 + charlock_holmes (~> 0.6.9)
181 growl (1.0.3) 175 growl (1.0.3)
182 guard (1.5.4) 176 guard (1.5.4)
183 listen (>= 0.4.2) 177 listen (>= 0.4.2)
@@ -480,7 +474,7 @@ DEPENDENCIES @@ -480,7 +474,7 @@ DEPENDENCIES
480 gon 474 gon
481 grape (~> 0.3.1) 475 grape (~> 0.3.1)
482 grape-entity (~> 0.2.0) 476 grape-entity (~> 0.2.0)
483 - grit_ext! 477 + grit_ext (~> 0.6.2)
484 growl 478 growl
485 guard-rspec 479 guard-rspec
486 guard-spinach 480 guard-spinach