Download as
Browse Code »

Commit cb9b826010082e7ebbb8e8d7d3cfcc07691866f6

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

use github version instead of local one

Showing 2 changed files with 11 additions and 9 deletions   Show diff stats
@@ -26,7 +26,7 @@ gem 'omniauth-github' @@ -26,7 +26,7 @@ gem 'omniauth-github'
26 gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: '42297cdcee16284d2e4eff23d41377f52fc28b9d' 26 gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git', ref: '42297cdcee16284d2e4eff23d41377f52fc28b9d'
27 gem 'grit_ext', '~> 0.8.1' 27 gem 'grit_ext', '~> 0.8.1'
28 28
29 -gem 'gitlab_git', path: '../gitlab_git' 29 +gem 'gitlab_git', git: 'https://github.com/gitlabhq/gitlab_git.git', ref: '40703ee3925102a77f70c038b1948c251a9aaa46'
30 30
31 # Ruby/Rack Git Smart-HTTP Server Handler 31 # Ruby/Rack Git Smart-HTTP Server Handler
32 gem 'gitlab-grack', '~> 1.0.0', require: 'grack' 32 gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
@@ -7,6 +7,16 @@ GIT @@ -7,6 +7,16 @@ GIT
7 rake (>= 0.8.7) 7 rake (>= 0.8.7)
8 8
9 GIT 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
10 remote: https://github.com/gitlabhq/grit.git 20 remote: https://github.com/gitlabhq/grit.git
11 revision: 42297cdcee16284d2e4eff23d41377f52fc28b9d 21 revision: 42297cdcee16284d2e4eff23d41377f52fc28b9d
12 ref: 42297cdcee16284d2e4eff23d41377f52fc28b9d 22 ref: 42297cdcee16284d2e4eff23d41377f52fc28b9d
@@ -32,14 +42,6 @@ GIT @@ -32,14 +42,6 @@ GIT
32 faye-websocket (~> 0.4, >= 0.4.4) 42 faye-websocket (~> 0.4, >= 0.4.4)
33 http_parser.rb (~> 0.5.3) 43 http_parser.rb (~> 0.5.3)
34 44
35 -PATH  
36 - remote: ../gitlab_git  
37 - specs:  
38 - gitlab_git (1.0.0)  
39 - activesupport (~> 3.2.13)  
40 - github-linguist (~> 2.3.4)  
41 - grit (~> 2.5.0)  
42 -  
43 GEM 45 GEM
44 remote: https://rubygems.org/ 46 remote: https://rubygems.org/
45 specs: 47 specs: