Download as
Browse Code »

Commit 233c9b8587d481af6b21099aaa22359a4ff502c4

Authored by Dmitriy Zaporozhets
1 parent 13dd7eb4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Use gitlab_git gem

Showing 2 changed files with 8 additions and 16 deletions   Show diff stats
Gemfile
  Diff comments   View file @233c9b8
... ... @@ -22,11 +22,9 @@ gem 'omniauth-twitter'
22 22 gem 'omniauth-github'
23 23  
24 24 # Extracting information from a git repository
25   -# Since gollum requires grit we cannot use gitlab-grit gem name any more. Use grit instead
  25 +# We cannot use original git since some bugs
26 26 gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: '42297cdcee16284d2e4eff23d41377f52fc28b9d'
27   -gem 'grit_ext', '~> 0.8.1'
28   -
29   -gem 'gitlab_git', git: 'https://github.com/gitlabhq/gitlab_git.git', ref: '40703ee3925102a77f70c038b1948c251a9aaa46'
  27 +gem 'gitlab_git', '~> 1.0.0'
30 28  
31 29 # Ruby/Rack Git Smart-HTTP Server Handler
32 30 gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
... ...
Gemfile.lock
  Diff comments   View file @233c9b8
... ... @@ -7,16 +7,6 @@ GIT
7 7 rake (>= 0.8.7)
8 8  
9 9 GIT
10   - remote: https://github.com/gitlabhq/gitlab_git.git
11   - revision: 40703ee3925102a77f70c038b1948c251a9aaa46
12   - ref: 40703ee3925102a77f70c038b1948c251a9aaa46
13   - specs:
14   - gitlab_git (1.0.0)
15   - activesupport (~> 3.2.13)
16   - github-linguist (~> 2.3.4)
17   - grit (~> 2.5.0)
18   -
19   -GIT
20 10 remote: https://github.com/gitlabhq/grit.git
21 11 revision: 42297cdcee16284d2e4eff23d41377f52fc28b9d
22 12 ref: 42297cdcee16284d2e4eff23d41377f52fc28b9d
... ... @@ -174,6 +164,11 @@ GEM
174 164 gitlab-pygments.rb (0.3.2)
175 165 posix-spawn (~> 0.3.6)
176 166 yajl-ruby (~> 1.1.0)
  167 + gitlab_git (1.0.0)
  168 + activesupport (~> 3.2.13)
  169 + github-linguist (~> 2.3.4)
  170 + grit (~> 2.5.0)
  171 + grit_ext (~> 0.8.1)
177 172 gitlab_meta (5.0)
178 173 gitlab_omniauth-ldap (1.0.2)
179 174 net-ldap (~> 0.2.2)
... ... @@ -511,7 +506,7 @@ DEPENDENCIES
511 506 github-markup (~> 0.7.4)
512 507 gitlab-grack (~> 1.0.0)
513 508 gitlab-pygments.rb (~> 0.3.2)
514   - gitlab_git!
  509 + gitlab_git (~> 1.0.0)
515 510 gitlab_meta (= 5.0)
516 511 gitlab_omniauth-ldap (= 1.0.2)
517 512 gollum-lib (~> 1.0.0)
... ... @@ -519,7 +514,6 @@ DEPENDENCIES
519 514 grape (~> 0.3.1)
520 515 grape-entity (~> 0.2.0)
521 516 grit (~> 2.5.0)!
522   - grit_ext (~> 0.8.1)
523 517 growl
524 518 guard-rspec
525 519 guard-spinach
... ...