deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #832 from akzhan/master

Browse source 
Use modified pygments.rb to allow dependency to rubypython 0.6
This commit is contained in:
Dmitriy Zaporozhets 2012-05-19 00:35:20 -07:00
commit eb25bfe2b2
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -19,7 +19,7 @@ gem "therubyracer"
gem "faker" gem "faker"
gem "seed-fu" gem "seed-fu"
gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
gem "pygments.rb", "0.2.11" gem "pygments.rb", "0.2.12", :git => "https://github.com/gitlabhq/pygments.rb.git"
gem "redcarpet", "~> 2.1.1" gem "redcarpet", "~> 2.1.1"
gem "thin" gem "thin"
gem "unicorn" gem "unicorn"

13
Gemfile.lock
View file

@ -31,6 +31,13 @@ GIT
mime-types (~> 1.18) mime-types (~> 1.18)
pygments.rb (~> 0.2.11) pygments.rb (~> 0.2.11)
GIT
remote: https://github.com/gitlabhq/pygments.rb.git
revision: dfa0d936da40f25e249a7d20f895e6d4cab72b50
specs:
pygments.rb (0.2.12)
rubypython (~> 0.6.1)
GIT GIT
remote: https://github.com/gitlabhq/yaml_db.git remote: https://github.com/gitlabhq/yaml_db.git
revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
@ -185,8 +192,6 @@ GEM
coderay (~> 1.0.5) coderay (~> 1.0.5)
method_source (~> 0.7.1) method_source (~> 0.7.1)
slop (>= 2.4.4, < 3) slop (>= 2.4.4, < 3)
pygments.rb (0.2.11)
rubypython (~> 0.5.3)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
rack (1.4.1) rack (1.4.1)
rack-cache (1.2) rack-cache (1.2)
@ -244,7 +249,7 @@ GEM
railties (>= 3.0) railties (>= 3.0)
rspec (~> 2.10.0) rspec (~> 2.10.0)
rubyntlm (0.1.1) rubyntlm (0.1.1)
rubypython (0.5.3) rubypython (0.6.1)
blankslate (>= 2.1.2.3) blankslate (>= 2.1.2.3)
ffi (~> 1.0.7) ffi (~> 1.0.7)
rubyzip (0.9.8) rubyzip (0.9.8)
@ -351,7 +356,7 @@ DEPENDENCIES
mysql2 mysql2
omniauth-ldap omniauth-ldap
pry pry
pygments.rb (= 0.2.11) pygments.rb (= 0.2.12)!
rails (= 3.2.3) rails (= 3.2.3)
rails-footnotes rails-footnotes
rake rake