3 files changed, 7 insertions, 7 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index b11815e013..ff6c905f3e 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -427,9 +427,9 @@ module Rails
     # Return an array of railties respecting the order they're loaded
     # and the order specified by the +railties_order+ config.
     #
-    # While when running initializers we need engines in reverse
-    # order here when copying migrations from railties we need them in the same
-    # order as given by +railties_order+.
+    # While running initializers we need engines in reverse order here when
+    # copying migrations from railties ; we need them in the order given by
+    # +railties_order+.
     def migration_railties # :nodoc:
       ordered_railties.flatten - [self]
     end
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index fd37fd0457..83cee28fa3 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -528,7 +528,7 @@ module Rails
     # Defines the routes for this engine. If a block is given to
     # routes, it is appended to the engine.
     def routes
-      @routes ||= ActionDispatch::Routing::RouteSet.new
+      @routes ||= ActionDispatch::Routing::RouteSet.new_with_config(config)
       @routes.append(&Proc.new) if block_given?
       @routes
     end
diff --git a/railties/lib/rails/ruby_version_check.rb b/railties/lib/rails/ruby_version_check.rb
index e2a199ec4d..9131c51e91 100644
--- a/railties/lib/rails/ruby_version_check.rb
+++ b/railties/lib/rails/ruby_version_check.rb
@@ -1,13 +1,13 @@
-if RUBY_VERSION < '2.2.0' && RUBY_ENGINE == 'ruby'
+if RUBY_VERSION < '2.2.1' && RUBY_ENGINE == 'ruby'
   desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
   abort <<-end_message
 
-    Rails 5 requires to run on Ruby 2.2.0 or newer.
+    Rails 5 requires to run on Ruby 2.2.1 or newer.
 
     You're running
       #{desc}
 
-    Please upgrade to Ruby 2.2.0 or newer to continue.
+    Please upgrade to Ruby 2.2.1 or newer to continue.
 
   end_message
 end