Merge pull request #947 from netdata/Update_gemfile_for_latest_grit

Update to the latest grit
gitlabhq · Jun 20, 2012 · 2255dc8 · 2255dc8
2 parents 3ca6c96 + 13e7ef4
commit 2255dc8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ gem "devise", "~> 1.5"
 gem "stamp"
 gem "kaminari"
 gem "haml-rails"
-gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "9536f306645f2d6b1f993ae02d3a29893ba8881f"
+gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
 gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
 gem "carrierwave"
 gem "six"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -15,8 +15,8 @@ GIT
 
 GIT
   remote: https://github.com/gitlabhq/grit.git
-  revision: 9536f306645f2d6b1f993ae02d3a29893ba8881f
-  ref: 9536f306645f2d6b1f993ae02d3a29893ba8881f
+  revision: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
+  ref: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
   specs:
     grit (2.5.0)
       diff-lcs (~> 1.1)