Download as
Browse Code »

Commit 332fc328a394ec1e6110af872d5cb51c920a4306

Authored by Robert Speicher
1 parent 187e192c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Revert "Use official Grit 2.5.0" 

This reverts commit 187e192cdf4470fa07a62aa0720c586b6dde2bde.

[ci skip]
Showing 2 changed files with 12 additions and 6 deletions   Show diff stats
@@ -22,7 +22,7 @@ gem 'omniauth-twitter' @@ -22,7 +22,7 @@ gem 'omniauth-twitter'
22 gem 'omniauth-github' 22 gem 'omniauth-github'
23 23
24 # GITLAB patched libs 24 # GITLAB patched libs
25 -gem "grit", '2.5.0' 25 +gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
26 gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e" 26 gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
27 gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" 27 gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
28 gem 'grack', :git => "https://github.com/gitlabhq/grack.git" 28 gem 'grack', :git => "https://github.com/gitlabhq/grack.git"
@@ -12,6 +12,16 @@ GIT @@ -12,6 +12,16 @@ GIT
12 rack (~> 1.4.1) 12 rack (~> 1.4.1)
13 13
14 GIT 14 GIT
  15 + remote: https://github.com/gitlabhq/grit.git
  16 + revision: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
  17 + ref: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
  18 + specs:
  19 + grit (2.5.0)
  20 + diff-lcs (~> 1.1)
  21 + mime-types (~> 1.15)
  22 + posix-spawn (~> 0.3.6)
  23 +
  24 +GIT
15 remote: https://github.com/gitlabhq/omniauth-ldap.git 25 remote: https://github.com/gitlabhq/omniauth-ldap.git
16 revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e 26 revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
17 ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e 27 ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
@@ -147,10 +157,6 @@ GEM @@ -147,10 +157,6 @@ GEM
147 rack 157 rack
148 rack-mount 158 rack-mount
149 gratr19 (0.4.4.1) 159 gratr19 (0.4.4.1)
150 - grit (2.5.0)  
151 - diff-lcs (~> 1.1)  
152 - mime-types (~> 1.15)  
153 - posix-spawn (~> 0.3.6)  
154 growl (1.0.3) 160 growl (1.0.3)
155 guard (1.3.2) 161 guard (1.3.2)
156 listen (>= 0.4.2) 162 listen (>= 0.4.2)
@@ -415,7 +421,7 @@ DEPENDENCIES @@ -415,7 +421,7 @@ DEPENDENCIES
415 gitolite (= 1.1.0) 421 gitolite (= 1.1.0)
416 grack! 422 grack!
417 grape (~> 0.2.1) 423 grape (~> 0.2.1)
418 - grit (= 2.5.0) 424 + grit!
419 growl 425 growl
420 guard-rspec 426 guard-rspec
421 guard-spinach 427 guard-spinach