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
Gemfile
  Diff comments   View file @512ab1b
... ... @@ -22,7 +22,7 @@ gem 'omniauth-twitter'
22 22 gem 'omniauth-github'
23 23  
24 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 26 gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
27 27 gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '2d1b2f13cabc02520405985fccb2a0abfcba9907'
28 28  
... ...
Gemfile.lock
  Diff comments   View file @512ab1b
... ... @@ -15,16 +15,6 @@ GIT
15 15 rack (~> 1.4.1)
16 16  
17 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 18 remote: https://github.com/gitlabhq/grit_ext.git
29 19 revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907
30 20 ref: 2d1b2f13cabc02520405985fccb2a0abfcba9907
... ... @@ -175,6 +165,10 @@ GEM
175 165 mime-types (~> 1.19)
176 166 pygments.rb (>= 0.2.13)
177 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 172 gitlab_meta (5.0)
179 173 gitlab_omniauth-ldap (1.0.2)
180 174 net-ldap (~> 0.2.2)
... ... @@ -486,6 +480,7 @@ DEPENDENCIES
486 480 git
487 481 github-linguist (~> 2.3.4)
488 482 github-markup (~> 0.7.4)
  483 + gitlab-grit (~> 1.0.0)
489 484 gitlab_meta (= 5.0)
490 485 gitlab_omniauth-ldap (= 1.0.2)
491 486 gitlab_yaml_db (= 1.0.0)
... ... @@ -493,7 +488,6 @@ DEPENDENCIES
493 488 grack!
494 489 grape (~> 0.3.1)
495 490 grape-entity (~> 0.2.0)
496   - grit!
497 491 grit_ext!
498 492 growl
499 493 guard-rspec
... ...