diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-15 20:35:37 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-15 20:35:37 +0000 |
| commit | a435ca727809ac829c0e7e97467457b76785a155 (patch) | |
| tree | 109c56063a979e6666a89f441318e22361a10f97 /app | |
| parent | c462a8790e8cb7562b49fa058e49b3137c4f314f (diff) | |
| download | redmine-a435ca727809ac829c0e7e97467457b76785a155.tar.gz redmine-a435ca727809ac829c0e7e97467457b76785a155.zip | |
Merged r12278 (#15311).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12281 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 2cabbd3e1..ad6581120 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -77,7 +77,8 @@ class AdminController < ApplicationController [:text_default_administrator_account_changed, User.default_admin_account_changed?], [:text_file_repository_writable, File.writable?(Attachment.storage_path)], [:text_plugin_assets_writable, File.writable?(Redmine::Plugin.public_directory)], - [:text_rmagick_available, Object.const_defined?(:Magick)] + [:text_rmagick_available, Object.const_defined?(:Magick)], + [:text_convert_available, Redmine::Thumbnail.convert_available?] ] end end |