Download as
Browse Code »

Commit d199de044425ad73caa031627c714b7010d76e3f

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

Use gitlab-pygments gem

Showing 2 changed files with 8 additions and 11 deletions   Show diff stats
Gemfile
  Diff comments   View file @d199de0
... ... @@ -36,7 +36,7 @@ gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
36 36 gem 'gitlab_yaml_db', '1.0.0', require: "yaml_db"
37 37  
38 38 # Syntax highlighter
39   -gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", branch: "master"
  39 +gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
40 40  
41 41 # Language detection
42 42 gem "github-linguist", "~> 2.3.4" , require: "linguist"
... ...
Gemfile.lock
  Diff comments   View file @d199de0
... ... @@ -15,15 +15,6 @@ GIT
15 15 charlock_holmes (~> 0.6.9)
16 16  
17 17 GIT
18   - remote: https://github.com/gitlabhq/pygments.rb.git
19   - revision: db1da0343adf86b49bdc3add04d02d2e80438d38
20   - branch: master
21   - specs:
22   - pygments.rb (0.3.2)
23   - posix-spawn (~> 0.3.6)
24   - yajl-ruby (~> 1.1.0)
25   -
26   -GIT
27 18 remote: https://github.com/gitlabhq/raphael-rails.git
28 19 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
29 20 specs:
... ... @@ -163,6 +154,9 @@ GEM
163 154 diff-lcs (~> 1.1)
164 155 mime-types (~> 1.15)
165 156 posix-spawn (~> 0.3.6)
  157 + gitlab-pygments.rb (0.3.2)
  158 + posix-spawn (~> 0.3.6)
  159 + yajl-ruby (~> 1.1.0)
166 160 gitlab_meta (5.0)
167 161 gitlab_omniauth-ldap (1.0.2)
168 162 net-ldap (~> 0.2.2)
... ... @@ -285,6 +279,9 @@ GEM
285 279 coderay (~> 1.0.5)
286 280 method_source (~> 0.8)
287 281 slop (~> 3.3.1)
  282 + pygments.rb (0.4.2)
  283 + posix-spawn (~> 0.3.6)
  284 + yajl-ruby (~> 1.1.0)
288 285 pyu-ruby-sasl (0.0.3.3)
289 286 quiet_assets (1.0.1)
290 287 railties (~> 3.1)
... ... @@ -476,6 +473,7 @@ DEPENDENCIES
476 473 github-markup (~> 0.7.4)
477 474 gitlab-grack (~> 1.0.0)
478 475 gitlab-grit (~> 1.0.0)
  476 + gitlab-pygments.rb (~> 0.3.2)
479 477 gitlab_meta (= 5.0)
480 478 gitlab_omniauth-ldap (= 1.0.2)
481 479 gitlab_yaml_db (= 1.0.0)
... ... @@ -503,7 +501,6 @@ DEPENDENCIES
503 501 pg
504 502 poltergeist (= 1.1.0)
505 503 pry
506   - pygments.rb!
507 504 quiet_assets (~> 1.0.1)
508 505 rack-mini-profiler
509 506 rails (= 3.2.12)
... ...