Merge branch 'rmagick_bypass_version_test' into backbone.ws
This commit is contained in:
commit
efe53a60c5
|
@ -26,6 +26,8 @@ require 'redmine/notifiable'
|
||||||
require 'redmine/wiki_formatting'
|
require 'redmine/wiki_formatting'
|
||||||
require 'redmine/scm/base'
|
require 'redmine/scm/base'
|
||||||
|
|
||||||
|
RMAGICK_BYPASS_VERSION_TEST = true
|
||||||
|
|
||||||
begin
|
begin
|
||||||
require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
|
require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
|
|
Loading…
Reference in New Issue