diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-06-04 14:07:46 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-06-04 14:07:46 +0000 |
| commit | 01411ab567887eb329d33a68f7635d3297649b5f (patch) | |
| tree | 2237eb51cf4a0f2c25335f56396dbb099596282a | |
| parent | 7e4d0209bbd7ab564a4ab9b0a644639ab058e745 (diff) | |
| download | redmine-01411ab567887eb329d33a68f7635d3297649b5f.tar.gz redmine-01411ab567887eb329d33a68f7635d3297649b5f.zip | |
prevent coderay "warning: already initialized constant" on Ruby 1.8.7 (#13692)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11925 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | lib/redmine/syntax_highlighting.rb | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -3,7 +3,7 @@ source 'https://rubygems.org' gem "rails", "3.2.13" gem "jquery-rails", "~> 2.0.2" gem "i18n", "~> 0.6.0" -gem "coderay", "~> 1.0.6" +gem "coderay", "~> 1.0.9" gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] gem "builder", "3.0.0" diff --git a/lib/redmine/syntax_highlighting.rb b/lib/redmine/syntax_highlighting.rb index e8d9067d4..a1f94a175 100644 --- a/lib/redmine/syntax_highlighting.rb +++ b/lib/redmine/syntax_highlighting.rb @@ -33,7 +33,6 @@ module Redmine module CodeRay require 'coderay' - require 'coderay/helpers/file_type' class << self # Highlights +text+ as the content of +filename+ |