diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2018-04-23 16:01:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 16:01:16 -0500 |
| commit | ef5902a2f195c2be5a4e9ad0f31003774a93aa1c (patch) | |
| tree | d9366b40aa381688eb828d54628d5712bc5a1a60 /railties | |
| parent | e970d15211a8efd7349ff0e90d44d887b85793c2 (diff) | |
| parent | f2e2cef15bdb31353aee2254ca2ab378979cc24a (diff) | |
| download | rails-ef5902a2f195c2be5a4e9ad0f31003774a93aa1c.tar.gz rails-ef5902a2f195c2be5a4e9ad0f31003774a93aa1c.tar.bz2 rails-ef5902a2f195c2be5a4e9ad0f31003774a93aa1c.zip | |
Merge pull request #32471 from janko-m/use-image_processing-gem
Use ImageProcessing gem for ActiveStorage variants
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile.tt | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt index 5e7455cdc7..1567333023 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt @@ -23,7 +23,7 @@ ruby <%= "'#{RUBY_VERSION}'" -%> <% unless skip_active_storage? -%> # Use ActiveStorage variant -# gem 'mini_magick', '~> 4.8' +# gem 'image_processing', '~> 1.2' <% end -%> # Use Capistrano for deployment diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index d6b98eb4d5..9b80cfa406 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -312,7 +312,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_active_storage_mini_magick_gem run_generator - assert_file "Gemfile", /^# gem 'mini_magick'/ + assert_file "Gemfile", /^# gem 'image_processing'/ end def test_mini_magick_gem_when_skip_active_storage_is_given @@ -320,7 +320,7 @@ class AppGeneratorTest < Rails::Generators::TestCase run_generator [app_root, "--skip-active-storage"] assert_file "#{app_root}/Gemfile" do |content| - assert_no_match(/gem 'mini_magick'/, content) + assert_no_match(/gem 'image_processing'/, content) end end |