diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2018-04-12 21:45:17 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-04-12 14:45:17 +0200 |
| commit | 50529cbceb84e611bca497624a7a4c38113e5135 (patch) | |
| tree | 753e4e8975f0404717e451fceb64d341f19435fc /config/application.rb | |
| parent | 8e88a18316d45a459a31d67487bccc247592d187 (diff) | |
Upgrade Rails to version 5.2.0 (#5898)
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/config/application.rb b/config/application.rb index 385bd4704..e989e2333 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,7 +23,7 @@ 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 + config.load_defaults 5.2 # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -85,15 +85,6 @@ module Mastodon config.active_job.queue_adapter = :sidekiq - config.middleware.insert_before 0, Rack::Cors do - allow do - origins '*' - resource '/@:username', headers: :any, methods: [:get], credentials: false - resource '/api/*', headers: :any, methods: [:post, :put, :delete, :get, :patch, :options], credentials: false, expose: ['Link', 'X-RateLimit-Reset', 'X-RateLimit-Limit', 'X-RateLimit-Remaining', 'X-Request-Id'] - resource '/oauth/token', headers: :any, methods: [:post], credentials: false - end - end - config.middleware.use Rack::Attack config.middleware.use Rack::Deflater |