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
Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
[pettanr/pettanr.git]
/
config
/
application.rb
diff --git
a/config/application.rb
b/config/application.rb
index
4769151
..
78e162f
100644
(file)
--- a/
config/application.rb
+++ b/
config/application.rb
@@
-17,7
+17,7
@@
if defined?(Bundler)
end
module Pettanr
end
module Pettanr
- VERSION = '0.
5.3
'
+ VERSION = '0.
6.1
'
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
@@
-61,12
+61,21
@@
config.assets.initialize_on_precompile = false
end
def self.licenses
end
def self.licenses
- @@licenses
+ @@licenses
|| {}
end
end
- end
+
+ def self.speech_balloons=(ary)
+ @@speech_balloons = ary
+ end
+
+ def self.speech_balloons
+ @@speech_balloons || {}
+ end
+ end
end
Pettanr::Application.licenses = YAML.load(open(Rails.root + 'config/license.yml').read)
end
Pettanr::Application.licenses = YAML.load(open(Rails.root + 'config/license.yml').read)
+Pettanr::Application.speech_balloons = YAML.load(open(Rails.root + 'config/speech_balloon.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'
MagicNumber = YAML.load(open(Rails.root + 'config/magic_number.yml').read)
MagicNumber['test_layout'] = if File.exist? Rails.root + 'config/test_layout'
'test'
@@
-90,5
+99,7
@@
end
module Pettanr
TestLayout = false
module Pettanr
TestLayout = false
+ class BadRequest < StandardError
+ end
end
end