Download as
Browse Code »

Commit eb25bfe2b2233761115efa31577d70e9954f66d1

Authored by Dmitriy Zaporozhets
2 parents 02dc2565 7c154aa4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #832 from akzhan/master 

Use modified pygments.rb to allow dependency to rubypython 0.6
Showing 2 changed files with 10 additions and 5 deletions   Show diff stats
Gemfile
  Diff comments   View file @eb25bfe
... ... @@ -19,7 +19,7 @@ gem "therubyracer"
19 19 gem "faker"
20 20 gem "seed-fu"
21 21 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
22   -gem "pygments.rb", "0.2.11"
  22 +gem "pygments.rb", "0.2.12", :git => "https://github.com/gitlabhq/pygments.rb.git"
23 23 gem "redcarpet", "~> 2.1.1"
24 24 gem "thin"
25 25 gem "unicorn"
... ...
Gemfile.lock
  Diff comments   View file @eb25bfe
... ... @@ -32,6 +32,13 @@ GIT
32 32 pygments.rb (~> 0.2.11)
33 33  
34 34 GIT
  35 + remote: https://github.com/gitlabhq/pygments.rb.git
  36 + revision: dfa0d936da40f25e249a7d20f895e6d4cab72b50
  37 + specs:
  38 + pygments.rb (0.2.12)
  39 + rubypython (~> 0.6.1)
  40 +
  41 +GIT
35 42 remote: https://github.com/gitlabhq/yaml_db.git
36 43 revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
37 44 specs:
... ... @@ -185,8 +192,6 @@ GEM
185 192 coderay (~> 1.0.5)
186 193 method_source (~> 0.7.1)
187 194 slop (>= 2.4.4, < 3)
188   - pygments.rb (0.2.11)
189   - rubypython (~> 0.5.3)
190 195 pyu-ruby-sasl (0.0.3.3)
191 196 rack (1.4.1)
192 197 rack-cache (1.2)
... ... @@ -244,7 +249,7 @@ GEM
244 249 railties (>= 3.0)
245 250 rspec (~> 2.10.0)
246 251 rubyntlm (0.1.1)
247   - rubypython (0.5.3)
  252 + rubypython (0.6.1)
248 253 blankslate (>= 2.1.2.3)
249 254 ffi (~> 1.0.7)
250 255 rubyzip (0.9.8)
... ... @@ -351,7 +356,7 @@ DEPENDENCIES
351 356 mysql2
352 357 omniauth-ldap
353 358 pry
354   - pygments.rb (= 0.2.11)
  359 + pygments.rb (= 0.2.12)!
355 360 rails (= 3.2.3)
356 361 rails-footnotes
357 362 rake
... ...