Merge branch 'v06sheet' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06sheet

[pettanr/pettanr.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index a32bd2f..c6824f7 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,11 +1,15 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
-begin
-  require 'RMagick'
-rescue LoadError
-  require 'DMagick'
-end
+require 'RMagick'
+require 'rest_client'
+require 'inspire'
 
+require 'picture_io'
+require 'pettan_imager'
+require 'ar_helper'
+require 'import_result'
+require 'common'
+require 'element'
+require 'element_part'
 # Initialize the rails application
 Pettanr::Application.initialize!
-require 'picture_io'