diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-19 15:22:10 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-19 15:22:10 -0600 |
| commit | 2ca965c704075467226dbf798e13ac8e0e62cc15 (patch) | |
| tree | c437e1f4993a6337759eb09157c78cd8134fd774 /config/application.rb | |
| parent | 2b2de41bc7ecec15aa73650da153e50f0e16f16b (diff) | |
| parent | 0b888acfd4ffddd29f25c878373e9b9f5ec6c0ab (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index c1bf3cef2..ef97dbc06 100644 --- a/config/application.rb +++ b/config/application.rb @@ -19,6 +19,9 @@ require_relative '../lib/mastodon/redis_config' module Mastodon class Application < Rails::Application + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + # 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. |