Merge branch 'main' into load_defaults_7_1

crimethinc · Feb 27, 2024 · 4b2578c · 4b2578c
2 parents 016e1d8 + c10e71a
commit 4b2578c
Show file tree

Hide file tree

Showing 46 changed files with 11 additions and 217 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -82,12 +82,11 @@ GEM
       execjs (~> 2)
     awesome_print (1.9.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.893.0)
-    aws-sdk-core (3.191.2)
+    aws-partitions (1.894.0)
+    aws-sdk-core (3.191.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
-      base64
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.77.0)
       aws-sdk-core (~> 3, >= 3.191.0)
@@ -230,7 +229,7 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     llhttp-ffi (0.5.0)
@@ -279,7 +278,7 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    overcommit (0.62.0)
+    overcommit (0.63.0)
       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (~> 3.2)
@@ -396,7 +395,7 @@ GEM
       rspec-expectations (~> 3.12)
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
-    rspec-support (3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -428,12 +427,12 @@ GEM
       rubocop-factory_bot (~> 2.22)
     ruby-graphviz (1.2.5)
       rexml
-    ruby-lsp (0.14.1)
+    ruby-lsp (0.14.3)
       language_server-protocol (~> 3.17.0)
       prism (>= 0.22.0, < 0.25)
       sorbet-runtime (>= 0.5.10782)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.0)
+    ruby-vips (2.2.1)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     ruby_parser (3.21.0)
@@ -449,7 +448,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    selenium-webdriver (4.17.0)
+    selenium-webdriver (4.18.1)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -470,7 +469,7 @@ GEM
     sitemap_generator (6.3.0)
       builder (~> 3.0)
     smart_properties (1.17.0)
-    sorbet-runtime (0.5.11262)
+    sorbet-runtime (0.5.11268)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -480,7 +479,7 @@ GEM
       sprockets (>= 3.0.0)
     squasher (0.7.3)
     stackprof (0.2.26)
-    sterile (1.0.25)
+    sterile (1.0.26)
       nokogiri (>= 1.11.7)
     stimulus-rails (1.3.3)
       railties (>= 6.0.0)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -40,15 +40,6 @@ def library
     render "#{Current.theme}/pages/library"
   end
 
-  # TODO: Delete and all of its views and translation locale YAMLs
-  def post_order_success
-    @order_id = params[:ordernum]
-    @title    = PageTitle.new title_for(I18n.t('page_titles.about.store')),
-                              I18n.t('page_titles.about.post_order_success')
-
-    render "#{Current.theme}/pages/post_order_success"
-  end
-
   # TODO: make this view localizable
   def submission_guidelines
     @title = PageTitle.new I18n.t('page_titles.about.submission_guidelines')

diff --git a/app/views/2017/pages/post_order_success.html.erb b/app/views/2017/pages/post_order_success.html.erb
diff --git a/config/application.rb b/config/application.rb
@@ -28,7 +28,7 @@ class Application < Rails::Application
     config.middleware.insert_after ActionDispatch::Static, Rack::Deflater
 
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.1
+    config.load_defaults 7.0
 
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.

diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
@@ -141,7 +141,6 @@ ar:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day
     search:

diff --git a/config/locales/be.yml b/config/locales/be.yml
@@ -141,7 +141,6 @@ be:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       rss_feeds: RSS Feeds
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
@@ -141,7 +141,6 @@ bg:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       rss_feeds: RSS Feeds
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
@@ -141,7 +141,6 @@ bn:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day
     search:

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
@@ -142,7 +142,6 @@ cs:
       about: O nás
       library: Online knihovna
       store: Obchod
-      post_order_success: Post-Order Glow
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day
     search:

diff --git a/config/locales/cz.yml b/config/locales/cz.yml
@@ -140,7 +140,6 @@ cz:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day
     search:

diff --git a/config/locales/da.yml b/config/locales/da.yml
@@ -141,7 +141,6 @@ da:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day
     search:

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -140,7 +140,6 @@ de:
       about: About
       library: Online Bibliothek
       store: Shop
-      post_order_success: Glühen nach der Bestellung
       submission_guidelines: Richtlinien für's Einreichen von Beiträgen
       steal_something_from_work_day: Steal Something from Work Day
     search:

diff --git a/config/locales/dv.yml b/config/locales/dv.yml
@@ -141,7 +141,6 @@ dv:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day
     search:

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -141,7 +141,6 @@ en:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       rss_feeds: RSS Feeds
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -152,7 +152,6 @@ es:
       about: About
       library: Biblioteca en línea
       store: Tienda
-      post_order_success: Envíos Glow # I am not sure what you mean by Glow.
       submission_guidelines: Para colaboraciones
       steal_something_from_work_day: Steal Something from Work Day
     search:

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
@@ -141,7 +141,6 @@ eu:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       rss_feeds: RSS Feeds
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
@@ -141,7 +141,6 @@ fa:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day
     search:

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
@@ -141,7 +141,6 @@ fi:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day
     search:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -153,7 +153,6 @@ fr:
       about: À propos
       library: Bibliothèque de lecture en ligne
       store: Boutique
-      post_order_success: La joie d'après-commande
       submission_guidelines: Lignes directrices pour soumettre un article
       steal_something_from_work_day: La Journée « Vole Quelque Chose au Travail »
     search:

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
@@ -141,7 +141,6 @@ gl:
       about: About
       library: Online Reading Library
       store: Store
-      post_order_success: Post-Order Glow
       submission_guidelines: Submission Guidelines
       steal_something_from_work_day: Steal Something from Work Day
     search: