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
@@ -19,7 +19,7 @@ gem "therubyracer" @@ -19,7 +19,7 @@ gem "therubyracer"
19 gem "faker" 19 gem "faker"
20 gem "seed-fu" 20 gem "seed-fu"
21 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" 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 gem "redcarpet", "~> 2.1.1" 23 gem "redcarpet", "~> 2.1.1"
24 gem "thin" 24 gem "thin"
25 gem "unicorn" 25 gem "unicorn"
@@ -32,6 +32,13 @@ GIT @@ -32,6 +32,13 @@ GIT
32 pygments.rb (~> 0.2.11) 32 pygments.rb (~> 0.2.11)
33 33
34 GIT 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 remote: https://github.com/gitlabhq/yaml_db.git 42 remote: https://github.com/gitlabhq/yaml_db.git
36 revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd 43 revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
37 specs: 44 specs:
@@ -185,8 +192,6 @@ GEM @@ -185,8 +192,6 @@ GEM
185 coderay (~> 1.0.5) 192 coderay (~> 1.0.5)
186 method_source (~> 0.7.1) 193 method_source (~> 0.7.1)
187 slop (>= 2.4.4, < 3) 194 slop (>= 2.4.4, < 3)
188 - pygments.rb (0.2.11)  
189 - rubypython (~> 0.5.3)  
190 pyu-ruby-sasl (0.0.3.3) 195 pyu-ruby-sasl (0.0.3.3)
191 rack (1.4.1) 196 rack (1.4.1)
192 rack-cache (1.2) 197 rack-cache (1.2)
@@ -244,7 +249,7 @@ GEM @@ -244,7 +249,7 @@ GEM
244 railties (>= 3.0) 249 railties (>= 3.0)
245 rspec (~> 2.10.0) 250 rspec (~> 2.10.0)
246 rubyntlm (0.1.1) 251 rubyntlm (0.1.1)
247 - rubypython (0.5.3) 252 + rubypython (0.6.1)
248 blankslate (>= 2.1.2.3) 253 blankslate (>= 2.1.2.3)
249 ffi (~> 1.0.7) 254 ffi (~> 1.0.7)
250 rubyzip (0.9.8) 255 rubyzip (0.9.8)
@@ -351,7 +356,7 @@ DEPENDENCIES @@ -351,7 +356,7 @@ DEPENDENCIES
351 mysql2 356 mysql2
352 omniauth-ldap 357 omniauth-ldap
353 pry 358 pry
354 - pygments.rb (= 0.2.11) 359 + pygments.rb (= 0.2.12)!
355 rails (= 3.2.3) 360 rails (= 3.2.3)
356 rails-footnotes 361 rails-footnotes
357 rake 362 rake