Merge remote branch 'mainstream/master'

1 files changed, 36 insertions, 0 deletions

diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb
new file mode 100644
index 0000000000..466e1e50ec
--- /dev/null
+++ b/railties/lib/generators/rails/app/templates/config/boot.rb
@@ -0,0 +1,36 @@
+# Use Bundler (preferred)
+environment = File.expand_path('../../vendor/gems/environment', __FILE__)
+if File.exist?("#{environment}.rb")
+  require environment
+
+# Use 2.x style vendor/rails and RubyGems
+else
+  vendor_rails = File.expand_path('../../vendor/rails', __FILE__)
+  if File.exist?(vendor_rails)
+    Dir["#{vendor_rails}/*/lib"].each { |path| $:.unshift(path) }
+  end
+
+  require 'rubygems'
+end
+
+<% unless options[:skip_activerecord] -%>
+require 'rails/all'
+
+# To pick the frameworks you want, remove 'require "rails/all"'
+# and list the framework railties that you want:
+#
+# require "active_model/railtie"
+# require "active_record/railtie"
+# require "action_controller/railtie"
+# require "action_view/railtie"
+# require "action_mailer/railtie"
+# require "active_resource/railtie"
+<% else -%>
+# Pick the frameworks you want:
+# require "active_record/railtie"
+require "active_model/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+require "action_mailer/railtie"
+require "active_resource/railtie"
+<% end -%>
\ No newline at end of file