Merge branch 'master' into make-reverse-merge-bang-order-consistent

1 files changed, 6 insertions, 6 deletions

diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 00add5829d..a12ca42c30 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -1,4 +1,4 @@
-require "rails/ruby_version_check"
+require_relative "rails/ruby_version_check"
 
 require "pathname"
 
@@ -9,8 +9,8 @@ require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/array/extract_options"
 require "active_support/core_ext/object/blank"
 
-require "rails/application"
-require "rails/version"
+require_relative "rails/application"
+require_relative "rails/version"
 
 require "active_support/railtie"
 require "action_dispatch/railtie"
@@ -48,7 +48,7 @@ module Rails
     def backtrace_cleaner
       @backtrace_cleaner ||= begin
         # Relies on Active Support, so we have to lazy load to postpone definition until Active Support has been loaded
-        require "rails/backtrace_cleaner"
+        require_relative "rails/backtrace_cleaner"
         Rails::BacktraceCleaner.new
       end
     end
@@ -87,8 +87,8 @@ module Rails
     #   groups assets: [:development, :test]
     #
     #   # Returns
-    #   # => [:default, :development, :assets] for Rails.env == "development"
-    #   # => [:default, :production]           for Rails.env == "production"
+    #   # => [:default, "development", :assets] for Rails.env == "development"
+    #   # => [:default, "production"]           for Rails.env == "production"
     def groups(*groups)
       hash = groups.extract_options!
       env = Rails.env