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

diff --git a/Gemfile b/Gemfile
index 865363bd4c3fd0b10e43d6a2d55b99c28d0c602c..22885e9faa3b482d043b47e79328fd86b5dac6c7 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -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 e8d9067d4b63f1334bcf944244d9f0135a8b1ec6..a1f94a175ee3053052a98cc12b234c44017766b8 100644 (file)
--- 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+