Commit 332fc328 authored by Robert Speicher's avatar Robert Speicher

Revert "Use official Grit 2.5.0"

This reverts commit 187e192c.

[ci skip]
parent 187e192c
...@@ -22,7 +22,7 @@ gem 'omniauth-twitter' ...@@ -22,7 +22,7 @@ gem 'omniauth-twitter'
gem 'omniauth-github' gem 'omniauth-github'
# GITLAB patched libs # GITLAB patched libs
gem "grit", '2.5.0' gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e" gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
gem 'grack', :git => "https://github.com/gitlabhq/grack.git" gem 'grack', :git => "https://github.com/gitlabhq/grack.git"
......
...@@ -11,6 +11,16 @@ GIT ...@@ -11,6 +11,16 @@ GIT
grack (1.0.0) grack (1.0.0)
rack (~> 1.4.1) rack (~> 1.4.1)
GIT
remote: https://github.com/gitlabhq/grit.git
revision: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
ref: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
specs:
grit (2.5.0)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
GIT GIT
remote: https://github.com/gitlabhq/omniauth-ldap.git remote: https://github.com/gitlabhq/omniauth-ldap.git
revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
...@@ -147,10 +157,6 @@ GEM ...@@ -147,10 +157,6 @@ GEM
rack rack
rack-mount rack-mount
gratr19 (0.4.4.1) gratr19 (0.4.4.1)
grit (2.5.0)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
growl (1.0.3) growl (1.0.3)
guard (1.3.2) guard (1.3.2)
listen (>= 0.4.2) listen (>= 0.4.2)
...@@ -415,7 +421,7 @@ DEPENDENCIES ...@@ -415,7 +421,7 @@ DEPENDENCIES
gitolite (= 1.1.0) gitolite (= 1.1.0)
grack! grack!
grape (~> 0.2.1) grape (~> 0.2.1)
grit (= 2.5.0) grit!
growl growl
guard-rspec guard-rspec
guard-spinach guard-spinach
......
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