diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-06-05 04:06:47 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-06-05 04:06:47 +0000 |
| commit | 489527ada71e72e1b9aec0f67062a1c1024f5705 (patch) | |
| tree | 91a764f8200a589f7df8d12beaf3229db5edf3a9 | |
| parent | 6ce685a63c9df18e5e686a7759132d905a947a31 (diff) | |
| download | redmine-489527ada71e72e1b9aec0f67062a1c1024f5705.tar.gz redmine-489527ada71e72e1b9aec0f67062a1c1024f5705.zip | |
Merged r11925 from trunk to 2.3-stable (#13692)
prevent coderay "warning: already initialized constant" on Ruby 1.8.7.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11929 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+ |