gitolite-client fork replaced with origin gem

diff --git a/Gemfile b/Gemfile
index 8e2bdb9..c9ca52f 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -23,13 +23,15 @@ gem 'omniauth-github'
 
 # GITLAB patched libs
 gem "grit",          :git => "https://github.com/gitlabhq/grit.git",            :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
-gem "gitolite",      :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
 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 => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
 gem 'yaml_db',       :git => "https://github.com/gitlabhq/yaml_db.git"
 gem 'grack',         :git => "https://github.com/gitlabhq/grack.git"
 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
 
+# Gitolite client (for work with gitolite-admin repo)
+gem "gitolite", '1.1.0'
+
 # API
 gem "grape", "~> 0.2.1"
 

diff --git a/Gemfile.lock b/Gemfile.lock
index f9a0128..f4d8e38 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,15 +5,6 @@ GIT
     annotate (2.4.1.beta1)
 
 GIT
-  remote: https://github.com/gitlabhq/gitolite-client.git
-  revision: 9b715ca8bab6529f6c92204a25f84d12f25a6eb0
-  ref: 9b715ca8bab6529f6c92204a25f84d12f25a6eb0
-  specs:
-    gitolite (0.0.4.alpha)
-      grit (>= 2.4.1)
-      hashery (~> 1.4.0)
-
-GIT
   remote: https://github.com/gitlabhq/grack.git
   revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
   specs:
@@ -168,12 +159,17 @@ GEM
     git (1.2.5)
     github-markup (0.7.4)
     gitlab_meta (2.9)
+    gitolite (1.1.0)
+      gratr19 (~> 0.4.4.1)
+      grit (~> 2.5.0)
+      hashery (~> 1.5.0)
     grape (0.2.1)
       hashie (~> 1.2)
       multi_json
       multi_xml
       rack
       rack-mount
+    gratr19 (0.4.4.1)
     growl (1.0.3)
     guard (1.3.2)
       listen (>= 0.4.2)
@@ -189,7 +185,8 @@ GEM
       activesupport (~> 3.0)
       haml (~> 3.0)
       railties (~> 3.0)
-    hashery (1.4.0)
+    hashery (1.5.0)
+      blankslate
     hashie (1.2.0)
     headless (0.3.1)
     hike (1.2.1)
@@ -432,7 +429,7 @@ DEPENDENCIES
   git
   github-markup (~> 0.7.4)
   gitlab_meta (= 2.9)
-  gitolite!
+  gitolite (= 1.1.0)
   grack!
   grape (~> 0.2.1)
   grit!