Download as
Browse Code »

Commit 282b804556b5727873527551da6cad3534144251

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

use gitlab-grack gem

Showing 2 changed files with 8 additions and 11 deletions   Show diff stats
@@ -21,9 +21,12 @@ gem 'omniauth-google-oauth2' @@ -21,9 +21,12 @@ gem 'omniauth-google-oauth2'
21 gem 'omniauth-twitter' 21 gem 'omniauth-twitter'
22 gem 'omniauth-github' 22 gem 'omniauth-github'
23 23
24 -# GITLAB patched libs 24 +# Extracting information from a git repository
25 gem "gitlab-grit", '~> 1.0.0', require: 'grit' 25 gem "gitlab-grit", '~> 1.0.0', require: 'grit'
26 -gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8' 26 +
  27 +# Ruby/Rack Git Smart-HTTP Server Handler
  28 +gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
  29 +
27 gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '2d1b2f13cabc02520405985fccb2a0abfcba9907' 30 gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '2d1b2f13cabc02520405985fccb2a0abfcba9907'
28 31
29 # LDAP Auth 32 # LDAP Auth
@@ -7,14 +7,6 @@ GIT @@ -7,14 +7,6 @@ GIT
7 rake (>= 0.8.7) 7 rake (>= 0.8.7)
8 8
9 GIT 9 GIT
10 - remote: https://github.com/gitlabhq/grack.git  
11 - revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8  
12 - ref: ba46f3b0845c6a09d488ae6abdce6ede37e227e8  
13 - specs:  
14 - grack (1.0.0)  
15 - rack (~> 1.4.1)  
16 -  
17 -GIT  
18 remote: https://github.com/gitlabhq/grit_ext.git 10 remote: https://github.com/gitlabhq/grit_ext.git
19 revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907 11 revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907
20 ref: 2d1b2f13cabc02520405985fccb2a0abfcba9907 12 ref: 2d1b2f13cabc02520405985fccb2a0abfcba9907
@@ -165,6 +157,8 @@ GEM @@ -165,6 +157,8 @@ GEM
165 mime-types (~> 1.19) 157 mime-types (~> 1.19)
166 pygments.rb (>= 0.2.13) 158 pygments.rb (>= 0.2.13)
167 github-markup (0.7.5) 159 github-markup (0.7.5)
  160 + gitlab-grack (1.0.0)
  161 + rack (~> 1.4.1)
168 gitlab-grit (1.0.0) 162 gitlab-grit (1.0.0)
169 diff-lcs (~> 1.1) 163 diff-lcs (~> 1.1)
170 mime-types (~> 1.15) 164 mime-types (~> 1.15)
@@ -480,12 +474,12 @@ DEPENDENCIES @@ -480,12 +474,12 @@ DEPENDENCIES
480 git 474 git
481 github-linguist (~> 2.3.4) 475 github-linguist (~> 2.3.4)
482 github-markup (~> 0.7.4) 476 github-markup (~> 0.7.4)
  477 + gitlab-grack (~> 1.0.0)
483 gitlab-grit (~> 1.0.0) 478 gitlab-grit (~> 1.0.0)
484 gitlab_meta (= 5.0) 479 gitlab_meta (= 5.0)
485 gitlab_omniauth-ldap (= 1.0.2) 480 gitlab_omniauth-ldap (= 1.0.2)
486 gitlab_yaml_db (= 1.0.0) 481 gitlab_yaml_db (= 1.0.0)
487 gon 482 gon
488 - grack!  
489 grape (~> 0.3.1) 483 grape (~> 0.3.1)
490 grape-entity (~> 0.2.0) 484 grape-entity (~> 0.2.0)
491 grit_ext! 485 grit_ext!