Download as
Browse Code »

Commit 245544a9d9807c6875eb7b3d63ab6d76468464d6

Authored by Riyad Preukschas
1 parent c42ada9b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Use pygments.rb fork with a custom formatter

Showing 2 changed files with 11 additions and 5 deletions   Show diff stats
@@ -33,7 +33,7 @@ gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref @@ -33,7 +33,7 @@ gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref
33 gem "gitolite", '1.1.0' 33 gem "gitolite", '1.1.0'
34 34
35 # Syntax highlighter 35 # Syntax highlighter
36 -gem "pygments.rb", "0.3.1" 36 +gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", ref: '4db80c599067e2d5f23c5c243bf85b8ca0368ad4'
37 37
38 # Language detection 38 # Language detection
39 gem "github-linguist", "~> 2.3.4" , require: "linguist" 39 gem "github-linguist", "~> 2.3.4" , require: "linguist"
@@ -42,6 +42,15 @@ GIT @@ -42,6 +42,15 @@ GIT
42 rubyntlm (~> 0.1.1) 42 rubyntlm (~> 0.1.1)
43 43
44 GIT 44 GIT
  45 + remote: https://github.com/gitlabhq/pygments.rb.git
  46 + revision: 4db80c599067e2d5f23c5c243bf85b8ca0368ad4
  47 + ref: 4db80c599067e2d5f23c5c243bf85b8ca0368ad4
  48 + specs:
  49 + pygments.rb (0.3.2)
  50 + posix-spawn (~> 0.3.6)
  51 + yajl-ruby (~> 1.1.0)
  52 +
  53 +GIT
45 remote: https://github.com/gitlabhq/yaml_db.git 54 remote: https://github.com/gitlabhq/yaml_db.git
46 revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd 55 revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
47 ref: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd 56 ref: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
@@ -266,9 +275,6 @@ GEM @@ -266,9 +275,6 @@ GEM
266 coderay (~> 1.0.5) 275 coderay (~> 1.0.5)
267 method_source (~> 0.7.1) 276 method_source (~> 0.7.1)
268 slop (>= 2.4.4, < 3) 277 slop (>= 2.4.4, < 3)
269 - pygments.rb (0.3.1)  
270 - posix-spawn (~> 0.3.6)  
271 - yajl-ruby (~> 1.1.0)  
272 pyu-ruby-sasl (0.0.3.3) 278 pyu-ruby-sasl (0.0.3.3)
273 quiet_assets (1.0.1) 279 quiet_assets (1.0.1)
274 railties (~> 3.1) 280 railties (~> 3.1)
@@ -465,7 +471,7 @@ DEPENDENCIES @@ -465,7 +471,7 @@ DEPENDENCIES
465 omniauth-twitter 471 omniauth-twitter
466 pg 472 pg
467 pry 473 pry
468 - pygments.rb (= 0.3.1) 474 + pygments.rb!
469 quiet_assets (= 1.0.1) 475 quiet_assets (= 1.0.1)
470 rack-mini-profiler 476 rack-mini-profiler
471 rails (= 3.2.8) 477 rails (= 3.2.8)