Download as
Browse Code »

Commit 80bfd6a50b409fc86446f40a84cbc2c90e13a304

Authored by randx
1 parent a8870e87
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

gitolite-client fork replaced with origin gem

Showing 2 changed files with 11 additions and 12 deletions   Show diff stats
Gemfile
  Diff comments   View file @80bfd6a
... ... @@ -23,13 +23,15 @@ gem 'omniauth-github'
23 23  
24 24 # GITLAB patched libs
25 25 gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
26   -gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
27 26 gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
28 27 gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
29 28 gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
30 29 gem 'grack', :git => "https://github.com/gitlabhq/grack.git"
31 30 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
32 31  
  32 +# Gitolite client (for work with gitolite-admin repo)
  33 +gem "gitolite", '1.1.0'
  34 +
33 35 # API
34 36 gem "grape", "~> 0.2.1"
35 37  
... ...
Gemfile.lock
  Diff comments   View file @80bfd6a
... ... @@ -5,15 +5,6 @@ GIT
5 5 annotate (2.4.1.beta1)
6 6  
7 7 GIT
8   - remote: https://github.com/gitlabhq/gitolite-client.git
9   - revision: 9b715ca8bab6529f6c92204a25f84d12f25a6eb0
10   - ref: 9b715ca8bab6529f6c92204a25f84d12f25a6eb0
11   - specs:
12   - gitolite (0.0.4.alpha)
13   - grit (>= 2.4.1)
14   - hashery (~> 1.4.0)
15   -
16   -GIT
17 8 remote: https://github.com/gitlabhq/grack.git
18 9 revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
19 10 specs:
... ... @@ -168,12 +159,17 @@ GEM
168 159 git (1.2.5)
169 160 github-markup (0.7.4)
170 161 gitlab_meta (2.9)
  162 + gitolite (1.1.0)
  163 + gratr19 (~> 0.4.4.1)
  164 + grit (~> 2.5.0)
  165 + hashery (~> 1.5.0)
171 166 grape (0.2.1)
172 167 hashie (~> 1.2)
173 168 multi_json
174 169 multi_xml
175 170 rack
176 171 rack-mount
  172 + gratr19 (0.4.4.1)
177 173 growl (1.0.3)
178 174 guard (1.3.2)
179 175 listen (>= 0.4.2)
... ... @@ -189,7 +185,8 @@ GEM
189 185 activesupport (~> 3.0)
190 186 haml (~> 3.0)
191 187 railties (~> 3.0)
192   - hashery (1.4.0)
  188 + hashery (1.5.0)
  189 + blankslate
193 190 hashie (1.2.0)
194 191 headless (0.3.1)
195 192 hike (1.2.1)
... ... @@ -432,7 +429,7 @@ DEPENDENCIES
432 429 git
433 430 github-markup (~> 0.7.4)
434 431 gitlab_meta (= 2.9)
435   - gitolite!
  432 + gitolite (= 1.1.0)
436 433 grack!
437 434 grape (~> 0.2.1)
438 435 grit!
... ...