Download as
Browse Code »

Commit 512ab1b61a10dd0d4fc9307d222db6b7fd7488f5

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

Use gem for gitlab grit

Showing 2 changed files with 6 additions and 12 deletions   Show diff stats
@@ -22,7 +22,7 @@ gem 'omniauth-twitter' @@ -22,7 +22,7 @@ gem 'omniauth-twitter'
22 gem 'omniauth-github' 22 gem 'omniauth-github'
23 23
24 # GITLAB patched libs 24 # GITLAB patched libs
25 -gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '9e98418ce2d654485b967003726aa2706a10060b' 25 +gem "gitlab-grit", '~> 1.0.0', require: 'grit'
26 gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8' 26 gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
27 gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '2d1b2f13cabc02520405985fccb2a0abfcba9907' 27 gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '2d1b2f13cabc02520405985fccb2a0abfcba9907'
28 28
@@ -15,16 +15,6 @@ GIT @@ -15,16 +15,6 @@ GIT
15 rack (~> 1.4.1) 15 rack (~> 1.4.1)
16 16
17 GIT 17 GIT
18 - remote: https://github.com/gitlabhq/grit.git  
19 - revision: 9e98418ce2d654485b967003726aa2706a10060b  
20 - ref: 9e98418ce2d654485b967003726aa2706a10060b  
21 - specs:  
22 - grit (2.5.0)  
23 - diff-lcs (~> 1.1)  
24 - mime-types (~> 1.15)  
25 - posix-spawn (~> 0.3.6)  
26 -  
27 -GIT  
28 remote: https://github.com/gitlabhq/grit_ext.git 18 remote: https://github.com/gitlabhq/grit_ext.git
29 revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907 19 revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907
30 ref: 2d1b2f13cabc02520405985fccb2a0abfcba9907 20 ref: 2d1b2f13cabc02520405985fccb2a0abfcba9907
@@ -175,6 +165,10 @@ GEM @@ -175,6 +165,10 @@ GEM
175 mime-types (~> 1.19) 165 mime-types (~> 1.19)
176 pygments.rb (>= 0.2.13) 166 pygments.rb (>= 0.2.13)
177 github-markup (0.7.5) 167 github-markup (0.7.5)
  168 + gitlab-grit (1.0.0)
  169 + diff-lcs (~> 1.1)
  170 + mime-types (~> 1.15)
  171 + posix-spawn (~> 0.3.6)
178 gitlab_meta (5.0) 172 gitlab_meta (5.0)
179 gitlab_omniauth-ldap (1.0.2) 173 gitlab_omniauth-ldap (1.0.2)
180 net-ldap (~> 0.2.2) 174 net-ldap (~> 0.2.2)
@@ -486,6 +480,7 @@ DEPENDENCIES @@ -486,6 +480,7 @@ DEPENDENCIES
486 git 480 git
487 github-linguist (~> 2.3.4) 481 github-linguist (~> 2.3.4)
488 github-markup (~> 0.7.4) 482 github-markup (~> 0.7.4)
  483 + gitlab-grit (~> 1.0.0)
489 gitlab_meta (= 5.0) 484 gitlab_meta (= 5.0)
490 gitlab_omniauth-ldap (= 1.0.2) 485 gitlab_omniauth-ldap (= 1.0.2)
491 gitlab_yaml_db (= 1.0.0) 486 gitlab_yaml_db (= 1.0.0)
@@ -493,7 +488,6 @@ DEPENDENCIES @@ -493,7 +488,6 @@ DEPENDENCIES
493 grack! 488 grack!
494 grape (~> 0.3.1) 489 grape (~> 0.3.1)
495 grape-entity (~> 0.2.0) 490 grape-entity (~> 0.2.0)
496 - grit!  
497 grit_ext! 491 grit_ext!
498 growl 492 growl
499 guard-rspec 493 guard-rspec