diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-19 00:35:20 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-19 00:35:20 -0700 |
| commit | eb25bfe2b2233761115efa31577d70e9954f66d1 (patch) | |
| tree | 93f19a521b1469e6e0d5eb08ca8a34ae394b0340 | |
| parent | 02dc25651411d5a60d760265903ebf629959ba59 (diff) | |
| parent | 7c154aa46097866aa28dba77ef77f9579f762f90 (diff) | |
| download | gitlab-ce-eb25bfe2b2233761115efa31577d70e9954f66d1.tar.gz | |
Merge pull request #832 from akzhan/master
Use modified pygments.rb to allow dependency to rubypython 0.6
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 13 |
2 files changed, 10 insertions, 5 deletions
@@ -19,7 +19,7 @@ gem "therubyracer" gem "faker" gem "seed-fu" 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 "thin" gem "unicorn" diff --git a/Gemfile.lock b/Gemfile.lock index 6a18f7d17d6..7bcd3b7a687 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,6 +32,13 @@ GIT 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 remote: https://github.com/gitlabhq/yaml_db.git revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd specs: @@ -185,8 +192,6 @@ GEM coderay (~> 1.0.5) method_source (~> 0.7.1) slop (>= 2.4.4, < 3) - pygments.rb (0.2.11) - rubypython (~> 0.5.3) pyu-ruby-sasl (0.0.3.3) rack (1.4.1) rack-cache (1.2) @@ -244,7 +249,7 @@ GEM railties (>= 3.0) rspec (~> 2.10.0) rubyntlm (0.1.1) - rubypython (0.5.3) + rubypython (0.6.1) blankslate (>= 2.1.2.3) ffi (~> 1.0.7) rubyzip (0.9.8) @@ -351,7 +356,7 @@ DEPENDENCIES mysql2 omniauth-ldap pry - pygments.rb (= 0.2.11) + pygments.rb (= 0.2.12)! rails (= 3.2.3) rails-footnotes rake |