diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-18 00:32:34 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-18 00:32:34 +0900 |
| commit | 45f2aa8c88d0ba51e7ad9e173ccbfd81040d2029 (patch) | |
| tree | 5772c631b1009ba872c2e6435ae5bea06f3b4059 | |
| parent | 84b134a80f2208f63a3757a440af87a093adac10 (diff) | |
| parent | 1df25e6f800d4202e5ee884d2819599e6e35e806 (diff) | |
| download | rails-45f2aa8c88d0ba51e7ad9e173ccbfd81040d2029.tar.gz rails-45f2aa8c88d0ba51e7ad9e173ccbfd81040d2029.tar.bz2 rails-45f2aa8c88d0ba51e7ad9e173ccbfd81040d2029.zip | |
Merge pull request #30633 from yhirano55/add_mini_magick_to_app_generator
Add `mini_magick` to default `Gemfile` as comment
| -rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 5057059898..ff440b7939 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,7 @@ +* Add `mini_magick` to default `Gemfile` as comment. + + *Yoshiyuki Hirano* + * Derive `secret_key_base` from the app name in development and test environments. Spares away needless secret configs. diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 7b7bebc957..770247d8ca 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -21,6 +21,9 @@ ruby <%= "'#{RUBY_VERSION}'" -%> # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + # Use Capistrano for deployment # gem 'capistrano-rails', group: :development |