Merge branch 'master' into asset-path-helper

Conflicts:
	railties/test/application/configuration_test.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
index f7e60749a7..4ecb94b65e 100644
--- a/railties/test/application/url_generation_test.rb
+++ b/railties/test/application/url_generation_test.rb
@@ -15,7 +15,7 @@ module ApplicationTests
 
       class MyApp < Rails::Application
         config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
-        config.session_store :cookie_store, :key => "_myapp_session"
+        config.session_store :cookie_store, key: "_myapp_session"
         config.active_support.deprecation = :log
       end
 
@@ -26,12 +26,12 @@ module ApplicationTests
 
       class ::OmgController < ::ApplicationController
         def index
-          render :text => omg_path
+          render text: omg_path
         end
       end
 
       MyApp.routes.draw do
-        get "/" => "omg#index", :as => :omg
+        get "/" => "omg#index", as: :omg
       end
 
       require 'rack/test'