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
fix spec
[pettanr/pettanr.git]
/
config
/
application.rb
diff --git
a/config/application.rb
b/config/application.rb
index
4769151
..
17af8a0
100644
(file)
--- a/
config/application.rb
+++ b/
config/application.rb
@@
-8,7
+8,7
@@
require "active_resource/railtie"
require "sprockets/railtie"
# require "rails/test_unit/railtie"
require 'digest/md5'
require "sprockets/railtie"
# require "rails/test_unit/railtie"
require 'digest/md5'
-
+$: << './lib'
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
Bundler.require(*Rails.groups(:assets => %w(development test)))
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
Bundler.require(*Rails.groups(:assets => %w(development test)))
@@
-17,7
+17,7
@@
if defined?(Bundler)
end
module Pettanr
end
module Pettanr
- VERSION = '0.
5.3
'
+ VERSION = '0.
6.2
'
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
@@
-39,6
+39,7
@@
config.assets.initialize_on_precompile = false
# config.time_zone = 'Central Time (US & Canada)'
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.time_zone = 'Central Time (US & Canada)'
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+ I18n.enforce_available_locales = false
config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]
config.i18n.default_locale = :ja
config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]
config.i18n.default_locale = :ja
@@
-54,26
+55,13
@@
config.assets.initialize_on_precompile = false
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
+ #config.autoload_paths += Dir["#{config.root}/lib/validators/*", "#{config.root}/lib/editor/*", "#{config.root}/lib/manifest/*"]
config.autoload_paths += %W(#{config.root}/lib/validators)
config.autoload_paths += %W(#{config.root}/lib/validators)
- def self.licenses=(ary)
- @@licenses = ary
- end
-
- def self.licenses
- @@licenses
- end
end
end
-end
-Pettanr::Application.licenses = YAML.load(open(Rails.root + 'config/license.yml').read)
-MagicNumber = YAML.load(open(Rails.root + 'config/magic_number.yml').read)
-MagicNumber['test_layout'] = if File.exist? Rails.root + 'config/test_layout'
- 'test'
-else
- false
end
end
-MagicNumber['profile'] = JSON.parse(open(Rails.root + 'config/profile.json').read).first[1] #strip profile body
+
y = YAML.load(open(Rails.root + 'config/picture_io.yml').read)
require y[Rails.env]["adapter"]
pio = PictureIO.const_get y[Rails.env]["io"]
y = YAML.load(open(Rails.root + 'config/picture_io.yml').read)
require y[Rails.env]["adapter"]
pio = PictureIO.const_get y[Rails.env]["io"]
@@
-90,5
+78,9
@@
end
module Pettanr
TestLayout = false
module Pettanr
TestLayout = false
+ class BadRequest < StandardError
+ end
+ class NotWork < StandardError
+ end
end
end