aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-07-17 13:59:59 -0400
committerGitHub <noreply@github.com>2017-07-17 13:59:59 -0400
commit8acca896cbaa01f6fc51969601888a440e83d53a (patch)
treeaacd9cde5cff853d39465c406d8314997b1f9ef6 /railties
parent8fd69db783b14dcdde92f4682b8d3c66bdbcb90b (diff)
parent0312a5c67e35b960e33677b5358c539f1047e4e1 (diff)
downloadrails-8acca896cbaa01f6fc51969601888a440e83d53a.tar.gz
rails-8acca896cbaa01f6fc51969601888a440e83d53a.tar.bz2
rails-8acca896cbaa01f6fc51969601888a440e83d53a.zip
Merge pull request #29313 from Shopify/bootsnap
Add bootsnap to default Gemfile
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md4
-rw-r--r--railties/lib/rails/generators/rails/app/templates/Gemfile3
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/boot.rb1
3 files changed, 8 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index db55d4fd69..f720b7caab 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Add `bootsnap` to default `Gemfile`.
+
+ *Burke Libbey*
+
* Properly expand shortcuts for environment's name running the `console`
and `dbconsole` commands.
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 64e2062aea..f49b503f85 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -19,6 +19,9 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.1.0', require: false
+
<%- if options.api? -%>
# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
# gem 'rack-cors'
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
index 30f5120df6..b9e460cef3 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -1,3 +1,4 @@
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.