diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 10:58:41 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 10:58:41 -0400 |
commit | 8593bcdf2471ce8d818e7b83e93fbe2d850f5029 (patch) | |
tree | e64ea4aef665c5a172207d8f26737678a1c200a6 /config/application.rb | |
parent | 33076ce4282d6dcb66fb83a2278668a6320b5845 (diff) | |
parent | d7dd03e3b43510bc3a79e592f600d7cb239bc8ca (diff) |
Merge branch 'clean2'
Conflicts:
config/initializers/mailboxer.rb
config/routes.rb
Diffstat (limited to 'config/application.rb')
-rw-r--r-- | config/application.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/config/application.rb b/config/application.rb index 57c9163..658e0aa 100644 --- a/config/application.rb +++ b/config/application.rb @@ -7,19 +7,19 @@ require 'rails/all' Bundler.require(:default, Rails.env) module Leaguer - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. + class Application < Rails::Application + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. - I18n.enforce_available_locales = true + I18n.enforce_available_locales = true - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. + # config.time_zone = 'Central Time (US & Canada)' - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - end + # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. + # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + # config.i18n.default_locale = :de + end end |