Update Alchemy to 7.1

AlchemyCMS · Feb 22, 2024 · 713755e · 713755e
1 parent cca8d0a
commit 713755e
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 33 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,9 +3,9 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby "~> #{`cat .ruby-version`.chomp.tr("ruby-", "")}"
 
-gem "alchemy_cms", "~> 7.0.0"
-gem "alchemy-devise", "~> 7.0.0"
-gem "alchemy_i18n", "~> 4.0.0"
+gem "alchemy_cms", "~> 7.1.0"
+gem "alchemy-devise", "~> 7.1.0"
+gem "alchemy_i18n", "~> 4.1.0"
 gem "alchemy_cloudinary", "~> 3.0"
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -77,21 +77,21 @@ GEM
       activerecord (>= 4.2)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    alchemy-devise (7.0.0)
-      alchemy_cms (>= 7.0.0.pre.rc1, < 8)
+    alchemy-devise (7.1.1)
+      alchemy_cms (>= 7.0.0, < 8)
       devise (>= 4.7.1, < 5)
     alchemy_cloudinary (3.0.0)
       alchemy_cms (>= 7.0, < 8.0)
       cloudinary (~> 1.9)
-    alchemy_cms (7.0.8)
-      actionmailer (>= 6.1, < 7.2)
-      actionpack (>= 6.1, < 7.2)
-      actionview (>= 6.1, < 7.2)
+    alchemy_cms (7.1.3)
+      actionmailer (>= 7.0, < 7.2)
+      actionpack (>= 7.0, < 7.2)
+      actionview (>= 7.0, < 7.2)
       active_model_serializers (~> 0.10.14)
-      activejob (>= 6.1, < 7.2)
-      activemodel (>= 6.1, < 7.2)
-      activerecord (>= 6.1, < 7.2)
-      activesupport (>= 6.1, < 7.2)
+      activejob (>= 7.0, < 7.2)
+      activemodel (>= 7.0, < 7.2)
+      activerecord (>= 7.0, < 7.2)
+      activesupport (>= 7.0, < 7.2)
       acts_as_list (>= 0.3, < 2)
       awesome_nested_set (~> 3.1)
       cancancan (>= 2.1, < 4.0)
@@ -104,17 +104,17 @@ GEM
       jquery-rails (~> 4.0, >= 4.0.4)
       kaminari (~> 1.1)
       originator (~> 3.1)
-      railties (>= 6.1, < 7.2)
+      railties (>= 7.0, < 7.2)
       ransack (>= 1.8, < 5.0)
       request_store (~> 1.2)
       responders (>= 2.0, < 4.0)
       sassc-rails (~> 2.1)
       simple_form (>= 4.0, < 6)
       sprockets (>= 3.0, < 5)
-      turbo-rails (>= 1.4)
+      turbo-rails (>= 1.4, < 2)
       view_component (~> 3.0)
-    alchemy_i18n (4.0.2)
-      alchemy_cms (>= 7.0.4, < 8)
+    alchemy_i18n (4.1.3)
+      alchemy_cms (>= 7.1.0.pre.b1, < 8)
       rails-i18n
     awesome_nested_set (3.6.0)
       activerecord (>= 4.0.0, < 7.2)
@@ -347,7 +347,7 @@ GEM
     thor (1.2.2)
     tilt (2.3.0)
     timeout (0.4.0)
-    turbo-rails (2.0.4)
+    turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
@@ -378,10 +378,10 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-nulldb-adapter
-  alchemy-devise (~> 7.0.0)
+  alchemy-devise (~> 7.1.0)
   alchemy_cloudinary (~> 3.0)
-  alchemy_cms (~> 7.0.0)
-  alchemy_i18n (~> 4.0.0)
+  alchemy_cms (~> 7.1.0)
+  alchemy_i18n (~> 4.1.0)
   bootsnap (>= 1.1.0)
   database_cleaner (~> 2.0)
   dotenv-rails (~> 2.7)

diff --git a/config/alchemy/config.yml b/config/alchemy/config.yml
@@ -78,13 +78,13 @@ items_per_page: 15
 #
 # ==== Global Options:
 #
-#   output_image_jpg_quality  [Integer]       # If image gets rendered as JPG this is the quality setting for it. (Default 85)
+#   output_image_quality      [Integer]       # If image gets rendered as JPG or WebP this is the quality setting for it. (Default 85)
 #   preprocess_image_resize   [String]        # Use this option to resize images to the given size when they are uploaded to the image library. Downsizing example: '1000x1000>' (Default nil)
 #   image_output_format       [String]        # The global image output format setting. (Default +original+)
 #
 # NOTE: You can always override the output format in the settings of your ingredients in elements.yml, I.E. {format: 'gif'}
 #
-output_image_jpg_quality: 85
+output_image_quality: 85
 preprocess_image_resize:
 image_output_format: original
 

diff --git a/config/alchemy/config.yml.defaults b/config/alchemy/config.yml.defaults
@@ -78,13 +78,13 @@ items_per_page: 15
 #
 # ==== Global Options:
 #
-#   output_image_jpg_quality  [Integer]       # If image gets rendered as JPG this is the quality setting for it. (Default 85)
+#   output_image_quality      [Integer]       # If image gets rendered as JPG or WebP this is the quality setting for it. (Default 85)
 #   preprocess_image_resize   [String]        # Use this option to resize images to the given size when they are uploaded to the image library. Downsizing example: '1000x1000>' (Default nil)
 #   image_output_format       [String]        # The global image output format setting. (Default +original+)
 #
 # NOTE: You can always override the output format in the settings of your ingredients in elements.yml, I.E. {format: 'gif'}
 #
-output_image_jpg_quality: 85
+output_image_quality: 85
 preprocess_image_resize:
 image_output_format: original
 
@@ -133,7 +133,8 @@ mailer:
   mail_from: your.mail@your-domain.com
   mail_to: your.mail@your-domain.com
   subject: A new contact form message
-  fields: [salutation, firstname, lastname, address, zip, city, phone, email, message]
+  fields:
+    [salutation, firstname, lastname, address, zip, city, phone, email, message]
   validate_fields: [lastname, email]
 
 # === User roles
@@ -166,14 +167,14 @@ uploader:
   file_size_limit: 100
   allowed_filetypes:
     alchemy/attachments:
-    - '*'
+      - "*"
     alchemy/pictures:
-    - jpg
-    - jpeg
-    - gif
-    - png
-    - svg
-    - webp
+      - jpg
+      - jpeg
+      - gif
+      - png
+      - svg
+      - webp
 
 # === Link Target Options
 #