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
2013-06-04 14:07:46 +00:00 · 2013-06-04 14:07:46 +00:00 · 01411ab567
parent 7e4d0209bb
commit 01411ab567
2 changed files with 1 additions and 2 deletions
--- a/2
+++ b/2
@ -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"

--- 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+