diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-18 08:00:45 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-18 08:00:45 -0700 |
| commit | 5428de1efd695fa171779dbbacf718e1be60d63e (patch) | |
| tree | 3d82f95cb9b2d6eecb4859891c06f19b7e9b92a5 /railties/lib/rails | |
| parent | bfcbaa55478577dafe4fa59c046e65e403451d04 (diff) | |
| parent | da26dfbefdccac4ab1f3195ae747685d2b11be13 (diff) | |
| download | rails-5428de1efd695fa171779dbbacf718e1be60d63e.tar.gz rails-5428de1efd695fa171779dbbacf718e1be60d63e.tar.bz2 rails-5428de1efd695fa171779dbbacf718e1be60d63e.zip | |
Merge pull request #5339 from gregolsen/week_start_config
week_start option added to rails app config
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index c4c1fcca40..580d7c6c77 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -13,7 +13,7 @@ module Rails :railties_order, :relative_url_root, :secret_token, :serve_static_assets, :ssl_options, :static_cache_control, :session_options, :time_zone, :reload_classes_only_on_change, - :queue, :queue_consumer + :queue, :queue_consumer, :beginning_of_week attr_writer :log_level attr_reader :encoding @@ -31,6 +31,7 @@ module Rails @session_store = :cookie_store @session_options = {} @time_zone = "UTC" + @beginning_of_week = :monday @log_level = nil @middleware = app_middleware @generators = app_generators |