OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rails upgrade to 4
[pettanr/pettanr.git]
/
config
/
environment.rb
diff --git
a/config/environment.rb
b/config/environment.rb
index
8edac06
..
4c91c76
100644
(file)
--- a/
config/environment.rb
+++ b/
config/environment.rb
@@
-1,22
+1,24
@@
# Load the rails application
require File.expand_path('../application', __FILE__)
# Load the rails application
require File.expand_path('../application', __FILE__)
+require 'open-uri'
require 'RMagick'
require 'rest_client'
require 'picture_io'
require 'pettan_imager'
require 'RMagick'
require 'rest_client'
require 'picture_io'
require 'pettan_imager'
-require 'ar_helper'
require 'operator'
require 'import_result'
require 'common'
require 'operator'
require 'import_result'
require 'common'
+# define Peta::Item before load model.
require_dependency 'peta'
require_dependency 'peta'
+# load Manifest(SystemResource.engine_resource) before config route
+require_dependency 'manifest'
# Initialize the rails application
# Initialize the rails application
+Manifest.manifest.init
Pettanr::Application.initialize!
Pettanr::Application.initialize!
-require_dependency 'manifest'
require_dependency 'local_manifest'
require_dependency 'locmare'
require_dependency 'editor'
require_dependency 'local_manifest'
require_dependency 'locmare'
require_dependency 'editor'
-Manifest.manifest.init
LocalManifest.manifest.init
Manifest.manifest.init_after_load_manifest
Manifest.manifest.load_models_manifest
LocalManifest.manifest.init
Manifest.manifest.init_after_load_manifest
Manifest.manifest.load_models_manifest