diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-08-02 12:28:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-02 12:28:56 -0700 |
| commit | 2762ebd84629ccc39a9959ecf15c9f82c1d283b3 (patch) | |
| tree | 30703ec9361dd96053fd0db65fa2796d828f493c /railties/lib/rails/application | |
| parent | 111227c0dfb72b060428063e35d865b62338654a (diff) | |
| parent | 31c1ed95d33bd9a46a6a4ebb5c1e1fa2af171969 (diff) | |
| download | rails-2762ebd84629ccc39a9959ecf15c9f82c1d283b3.tar.gz rails-2762ebd84629ccc39a9959ecf15c9f82c1d283b3.tar.bz2 rails-2762ebd84629ccc39a9959ecf15c9f82c1d283b3.zip | |
Merge branch 'master' into retry-and-discard-jobs
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 7d0c3daa23..285a63d4c6 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -34,6 +34,7 @@ module Rails @public_file_server.index_name = "index" @force_ssl = false @ssl_options = {} + @session_store = nil @time_zone = "UTC" @beginning_of_week = :monday @log_level = nil |