use gitlabhq/grack instead of my fork

2 files changed, 8 insertions, 8 deletions

diff --git a/Gemfile b/Gemfile
index 8394f7e9b8d..d4b3ce302f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem "gitolite",      :git => "https://github.com/gitlabhq/gitolite-client.git",
 gem "pygments.rb",   :git => "https://github.com/gitlabhq/pygments.rb.git",     :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
 gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git",   :ref => "7edf27d0281e09561838122982c16b7e62181f44"
 gem 'yaml_db',       :git => "https://github.com/gitlabhq/yaml_db.git"
-gem 'grack',         :git => "https://github.com/SaitoWu/grack.git"
+gem 'grack',         :git => "https://github.com/gitlabhq/grack.git"
 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
 
 gem "stamp"
diff --git a/Gemfile.lock b/Gemfile.lock
index 823f65e2d01..6287b2d4d11 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,4 @@
 GIT
-  remote: https://github.com/SaitoWu/grack.git
-  revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
-  specs:
-    grack (1.0.0)
-      rack (~> 1.4.1)
-
-GIT
   remote: https://github.com/ctran/annotate_models.git
   revision: 18cd39ad01829deba5aa34634b8540d6675ab978
   specs:
@@ -21,6 +14,13 @@ GIT
       hashery (~> 1.4.0)
 
 GIT
+  remote: https://github.com/gitlabhq/grack.git
+  revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
+  specs:
+    grack (1.0.0)
+      rack (~> 1.4.1)
+
+GIT
   remote: https://github.com/gitlabhq/grit.git
   revision: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
   ref: 7f35cb98ff17d534a07e3ce6ec3d580f67402837