From 332fc328a394ec1e6110af872d5cb51c920a4306 Mon Sep 17 00:00:00 2001 From: Robert Speicher <rspeicher@gmail.com> Date: Thu, 4 Oct 2012 14:19:17 -0400 Subject: [PATCH] Revert "Use official Grit 2.5.0" This reverts commit 187e192cdf4470fa07a62aa0720c586b6dde2bde. [ci skip] --- Gemfile | 2 +- Gemfile.lock | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index d0701732ea..042fbc4d3a 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'omniauth-twitter' gem 'omniauth-github' # 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 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" gem 'grack', :git => "https://github.com/gitlabhq/grack.git" diff --git a/Gemfile.lock b/Gemfile.lock index b54773edc5..3c3bea9d7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,6 +11,16 @@ GIT grack (1.0.0) 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 remote: https://github.com/gitlabhq/omniauth-ldap.git revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e @@ -147,10 +157,6 @@ GEM rack rack-mount 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) guard (1.3.2) listen (>= 0.4.2) @@ -415,7 +421,7 @@ DEPENDENCIES gitolite (= 1.1.0) grack! grape (~> 0.2.1) - grit (= 2.5.0) + grit! growl guard-rspec guard-spinach -- 2.30.9