Merge remote-tracking branch 'upstream/pull/2937' into master

[rails.git] / config / initializers / cors.rb

diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 2bd558d2f3f24ec4f4f9884cb9b1cf4c815505dc..7992ecdce015631749f425209dd83802b54ede21 100644 (file)
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -1,4 +1,4 @@
-require "rack/cors"
+# Be sure to restart your server when you modify this file.
 
 # Mark CORS responses as uncacheable as we don't want a browser to
 # try and reuse a response that had a different origin, even with
@@ -18,7 +18,7 @@ end
 # so browser-requests should be similarly permitted. (Though the API does not
 # require any custom headers, Ajax frameworks may automatically add headers
 # such as X-Requested-By to requests.)
-Rails.configuration.middleware.use OpenStreetMap::Cors do
+Rails.application.config.middleware.insert_before 0, OpenStreetMap::Cors do
   allow do
     origins "*"
     resource "/oauth/*", :headers => :any, :methods => [:get, :post]