From b2429b71f49c3fe99315250b7de3784dde344bb9 Mon Sep 17 00:00:00 2001 From: sto Date: Fri, 21 Nov 2025 10:39:16 +0100 Subject: [PATCH] Rollback prod config change --- Gemfile.lock | 40 +++++++++++++++--------------- app/views/puzzles/_form.html.slim | 7 +++--- config/environments/development.rb | 2 +- config/environments/production.rb | 2 -- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 11183af..286feb6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,7 +84,7 @@ GEM benchmark (0.5.0) bigdecimal (3.3.1) bindex (0.8.1) - bootsnap (1.18.6) + bootsnap (1.19.0) msgpack (~> 1.2) bootstrap (5.3.5) popper_js (>= 2.11.8, < 3) @@ -117,7 +117,7 @@ GEM dotenv (3.1.8) drb (2.2.3) ed25519 (1.4.0) - erb (5.1.3) + erb (6.0.0) erubi (1.13.1) et-orbi (1.4.0) tzinfo @@ -135,19 +135,19 @@ GEM raabro (~> 1.4) globalid (1.3.0) activesupport (>= 6.1) - google-protobuf (4.33.0) + google-protobuf (4.33.1) bigdecimal rake (>= 13) - google-protobuf (4.33.0-aarch64-linux-gnu) + google-protobuf (4.33.1-aarch64-linux-gnu) bigdecimal rake (>= 13) - google-protobuf (4.33.0-aarch64-linux-musl) + google-protobuf (4.33.1-aarch64-linux-musl) bigdecimal rake (>= 13) - google-protobuf (4.33.0-x86_64-linux-gnu) + google-protobuf (4.33.1-x86_64-linux-gnu) bigdecimal rake (>= 13) - google-protobuf (4.33.0-x86_64-linux-musl) + google-protobuf (4.33.1-x86_64-linux-musl) bigdecimal rake (>= 13) i18n (1.14.7) @@ -164,7 +164,7 @@ GEM jbuilder (2.14.1) actionview (>= 7.0.0) activesupport (>= 7.0.0) - json (2.15.2) + json (2.16.0) kamal (2.8.2) activesupport (>= 7.0) base64 (~> 0.2) @@ -191,7 +191,7 @@ GEM marcel (1.1.0) matrix (0.4.3) mini_mime (1.1.5) - minitest (5.26.0) + minitest (5.26.2) msgpack (1.8.0) net-imap (0.5.12) date @@ -289,7 +289,7 @@ GEM psych (>= 4.0.0) tsort regexp_parser (2.11.3) - reline (0.6.2) + reline (0.6.3) io-console (~> 0.5) rexml (3.4.4) rqrcode (3.1.0) @@ -324,14 +324,14 @@ GEM rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.47.1) + rubocop-ast (1.48.0) parser (>= 3.3.7.2) prism (~> 1.4) rubocop-performance (1.26.1) lint_roller (~> 1.1) rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.47.1, < 2.0) - rubocop-rails (2.33.4) + rubocop-rails (2.34.0) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) @@ -343,17 +343,17 @@ GEM rubocop-rails (>= 2.30) ruby-progressbar (1.13.0) rubyzip (3.2.2) - sass-embedded (1.93.3-aarch64-linux-gnu) + sass-embedded (1.94.2-aarch64-linux-gnu) google-protobuf (~> 4.31) - sass-embedded (1.93.3-aarch64-linux-musl) + sass-embedded (1.94.2-aarch64-linux-musl) google-protobuf (~> 4.31) - sass-embedded (1.93.3-arm-linux-gnueabihf) + sass-embedded (1.94.2-arm-linux-gnueabihf) google-protobuf (~> 4.31) - sass-embedded (1.93.3-arm-linux-musleabihf) + sass-embedded (1.94.2-arm-linux-musleabihf) google-protobuf (~> 4.31) - sass-embedded (1.93.3-x86_64-linux-gnu) + sass-embedded (1.94.2-x86_64-linux-gnu) google-protobuf (~> 4.31) - sass-embedded (1.93.3-x86_64-linux-musl) + sass-embedded (1.94.2-x86_64-linux-musl) google-protobuf (~> 4.31) securerandom (0.4.1) selenium-webdriver (4.38.0) @@ -370,7 +370,7 @@ GEM activejob (>= 7.2) activerecord (>= 7.2) railties (>= 7.2) - solid_cache (1.0.9) + solid_cache (1.0.10) activejob (>= 7.2) activerecord (>= 7.2) railties (>= 7.2) @@ -396,7 +396,7 @@ GEM ostruct stimulus-rails (1.3.4) railties (>= 6.0.0) - stringio (3.1.7) + stringio (3.1.8) temple (0.10.4) thor (1.4.0) thruster (0.1.16) diff --git a/app/views/puzzles/_form.html.slim b/app/views/puzzles/_form.html.slim index 677858c..ce68ef3 100644 --- a/app/views/puzzles/_form.html.slim +++ b/app/views/puzzles/_form.html.slim @@ -2,9 +2,10 @@ .row.mb-3 .col.alert.alert-warning = t("puzzles.form.fake_data_recommendation") - .row.mb-3 - .col - = image_tag(puzzle.image, class: "img-fluid", style: "max-height: 256px") if puzzle.image.attached? + - if puzzle.id && puzzle.image.attached? + .row.mb-3 + .col + = image_tag(puzzle.image, class: "img-fluid", style: "max-height: 256px") .row.mb-3 .col .form-floating diff --git a/config/environments/development.rb b/config/environments/development.rb index ceb5dbb..9c140d7 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -40,7 +40,7 @@ Rails.application.configure do # Set localhost to be used by links generated in mailer templates. config.action_mailer.default_url_options = { host: "localhost", port: 3000 } - config.action_controller.default_url_options = { host: "localhost" } + config.action_controller.default_url_options = { host: "192.168.122.105", port: 3000 } # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log diff --git a/config/environments/production.rb b/config/environments/production.rb index 7f891ca..bdcd01d 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -60,8 +60,6 @@ Rails.application.configure do # Set host to be used by links generated in mailer templates. config.action_mailer.default_url_options = { host: "example.com" } - config.action_controller.default_url_options = { host: "public-scoreboard.org" } - # Specify outgoing SMTP server. Remember to add smtp/* credentials via rails credentials:edit. # config.action_mailer.smtp_settings = { # user_name: Rails.application.credentials.dig(:smtp, :user_name),