From c89dfb3d18496469983d71074d9ca0cd39d4757b Mon Sep 17 00:00:00 2001 From: Ethan McCutchen Date: Wed, 4 Dec 2024 14:54:37 -0500 Subject: [PATCH 1/7] removed capistrano submod --- .gitmodules | 3 - Gemfile.lock | 688 +++++++++++++++++++++++++---------------------- vendor/decko | 2 +- vendor/decko-cap | 1 - 4 files changed, 369 insertions(+), 325 deletions(-) delete mode 160000 vendor/decko-cap diff --git a/.gitmodules b/.gitmodules index 355620a..f49de5d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "card-mods"] path = vendor/card-mods url = https://github.com/decko-commons/card-mods.git -[submodule "vendor/decko-cap"] - path = vendor/decko-cap - url = https://github.com/decko-commons/decko-cap [submodule "mod/wikirate_project/vendor/slick"] path = mod/wikirate_project/vendor/slick url = https://github.com/kenwheeler/slick.git diff --git a/Gemfile.lock b/Gemfile.lock index 2931b92..b8060bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,180 +30,182 @@ PATH PATH remote: vendor/decko/mod specs: - card-mod-account (0.15.6) - card (= 1.105.6) - card-mod-edit (= 0.15.6) - card-mod-email (= 0.15.6) - card-mod-integrate (= 0.15.6) - card-mod-list (= 0.15.6) - card-mod-permissions (= 0.15.6) - card-mod-ace_editor (0.15.6) - card (= 1.105.6) - card-mod-edit (= 0.15.6) - card-mod-script (= 0.15.6) - card-mod-api_key (0.15.6) - card (= 1.105.6) - card-mod-account (= 0.15.6) - card-mod-assets (0.15.6) - card (= 1.105.6) - card-mod-carrierwave (= 0.15.6) - card-mod-content (= 0.15.6) - card-mod-format (= 0.15.6) - card-mod-list (= 0.15.6) - card-mod-virtual (= 0.15.6) + card-mod-account (0.18.1) + card (= 1.108.1) + card-mod-edit (= 0.18.1) + card-mod-email (= 0.18.1) + card-mod-integrate (= 0.18.1) + card-mod-list (= 0.18.1) + card-mod-permissions (= 0.18.1) + card-mod-ace_editor (0.18.1) + card (= 1.108.1) + card-mod-edit (= 0.18.1) + card-mod-script (= 0.18.1) + card-mod-api_key (0.18.1) + card (= 1.108.1) + card-mod-account (= 0.18.1) + card-mod-assets (0.18.1) + card (= 1.108.1) + card-mod-carrierwave (= 0.18.1) + card-mod-content (= 0.18.1) + card-mod-format (= 0.18.1) + card-mod-list (= 0.18.1) + card-mod-virtual (= 0.18.1) execjs (~> 2.7, != 2.8.0) - card-mod-bar_and_box (0.15.6) - card (= 1.105.6) - card-mod-style (= 0.15.6) - card-mod-bootstrap (0.15.6) - card (= 1.105.6) - card-mod-bar_and_box (= 0.15.6) - card-mod-edit (= 0.15.6) - card-mod-script (= 0.15.6) - card-mod-style (= 0.15.6) - card-mod-carrierwave (0.15.6) - card (= 1.105.6) - card-mod-history (= 0.15.6) - card-mod-permissions (= 0.15.6) - carrierwave (~> 2.2) - mini_magick (~> 4.2) - ssrf_filter (~> 1.0.7) - card-mod-collection (0.15.6) - card (= 1.105.6) - card-mod-comment (0.15.6) - card (= 1.105.6) - card-mod-permissions (= 0.15.6) - card-mod-content (0.15.6) - card (= 1.105.6) - card-mod-date (0.15.6) - card (= 1.105.6) - card-mod-defaults (0.15.6) - card (= 1.105.6) - card-mod-account (= 0.15.6) - card-mod-ace_editor (= 0.15.6) - card-mod-api_key (= 0.15.6) - card-mod-assets (= 0.15.6) - card-mod-bar_and_box (= 0.15.6) - card-mod-bootstrap (= 0.15.6) - card-mod-carrierwave (= 0.15.6) - card-mod-comment (= 0.15.6) - card-mod-date (= 0.15.6) - card-mod-delayed_job (= 0.15.6) - card-mod-follow (= 0.15.6) - card-mod-help (= 0.15.6) - card-mod-history (= 0.15.6) - card-mod-integrate (= 0.15.6) - card-mod-layout (= 0.15.6) - card-mod-list (= 0.15.6) - card-mod-markdown (= 0.15.6) - card-mod-permissions (= 0.15.6) - card-mod-recaptcha (= 0.15.6) - card-mod-rules (= 0.15.6) - card-mod-search (= 0.15.6) - card-mod-tabs (= 0.15.6) - card-mod-tinymce_editor (= 0.15.6) - card-mod-delayed_job (0.15.6) - card (= 1.105.6) + card-mod-bar_and_box (0.18.1) + card (= 1.108.1) + card-mod-style (= 0.18.1) + card-mod-bootstrap (0.18.1) + card (= 1.108.1) + card-mod-bar_and_box (= 0.18.1) + card-mod-edit (= 0.18.1) + card-mod-script (= 0.18.1) + card-mod-style (= 0.18.1) + card-mod-carrierwave (0.18.1) + card (= 1.108.1) + card-mod-history (= 0.18.1) + card-mod-permissions (= 0.18.1) + carrierwave (~> 3.0) + marcel (= 1.0.2) + mini_magick (~> 4.12) + ssrf_filter (~> 1.1) + card-mod-collection (0.18.1) + card (= 1.108.1) + card-mod-comment (0.18.1) + card (= 1.108.1) + card-mod-permissions (= 0.18.1) + card-mod-content (0.18.1) + card (= 1.108.1) + card-mod-date (0.18.1) + card (= 1.108.1) + card-mod-defaults (0.18.1) + card (= 1.108.1) + card-mod-account (= 0.18.1) + card-mod-ace_editor (= 0.18.1) + card-mod-api_key (= 0.18.1) + card-mod-assets (= 0.18.1) + card-mod-bar_and_box (= 0.18.1) + card-mod-bootstrap (= 0.18.1) + card-mod-carrierwave (= 0.18.1) + card-mod-comment (= 0.18.1) + card-mod-date (= 0.18.1) + card-mod-delayed_job (= 0.18.1) + card-mod-follow (= 0.18.1) + card-mod-help (= 0.18.1) + card-mod-history (= 0.18.1) + card-mod-integrate (= 0.18.1) + card-mod-layout (= 0.18.1) + card-mod-list (= 0.18.1) + card-mod-markdown (= 0.18.1) + card-mod-permissions (= 0.18.1) + card-mod-recaptcha (= 0.18.1) + card-mod-rules (= 0.18.1) + card-mod-search (= 0.18.1) + card-mod-tabs (= 0.18.1) + card-mod-tinymce_editor (= 0.18.1) + card-mod-delayed_job (0.18.1) + card (= 1.108.1) daemons (~> 1.4) delayed_job_active_record (~> 4.1) delayed_job_web (~> 1.4) - card-mod-edit (0.15.6) - card (= 1.105.6) - card-mod-list (= 0.15.6) - card-mod-rules (= 0.15.6) - card-mod-email (0.15.6) - card (= 1.105.6) - card-mod-list (= 0.15.6) - card-mod-permissions (= 0.15.6) - card-mod-search (= 0.15.6) - card-mod-follow (0.15.6) - card (= 1.105.6) - card-mod-carrierwave (= 0.15.6) - card-mod-format (0.15.6) - card (= 1.105.6) - card-mod-content (= 0.15.6) - card-mod-help (0.15.6) - card (= 1.105.6) - card-mod-markdown (= 0.15.6) - card-mod-permissions (= 0.15.6) - card-mod-history (0.15.6) - card (= 1.105.6) - card-mod-integrate (0.15.6) - card (= 1.105.6) - card-mod-rules (= 0.15.6) - card-mod-layout (0.15.6) - card (= 1.105.6) - card-mod-account (= 0.15.6) - card-mod-session (= 0.15.6) - card-mod-tabs (= 0.15.6) - card-mod-list (0.15.6) - card (= 1.105.6) - card-mod-collection (= 0.15.6) - card-mod-format (= 0.15.6) - card-mod-markdown (0.15.6) - card (= 1.105.6) + card-mod-edit (0.18.1) + card (= 1.108.1) + card-mod-list (= 0.18.1) + card-mod-rules (= 0.18.1) + card-mod-email (0.18.1) + card (= 1.108.1) + card-mod-list (= 0.18.1) + card-mod-permissions (= 0.18.1) + card-mod-search (= 0.18.1) + card-mod-follow (0.18.1) + card (= 1.108.1) + card-mod-carrierwave (= 0.18.1) + card-mod-format (0.18.1) + card (= 1.108.1) + card-mod-content (= 0.18.1) + card-mod-help (0.18.1) + card (= 1.108.1) + card-mod-markdown (= 0.18.1) + card-mod-permissions (= 0.18.1) + card-mod-history (0.18.1) + card (= 1.108.1) + card-mod-integrate (0.18.1) + card (= 1.108.1) + card-mod-rules (= 0.18.1) + card-mod-layout (0.18.1) + card (= 1.108.1) + card-mod-account (= 0.18.1) + card-mod-session (= 0.18.1) + card-mod-tabs (= 0.18.1) + card-mod-list (0.18.1) + card (= 1.108.1) + card-mod-collection (= 0.18.1) + card-mod-format (= 0.18.1) + card-mod-markdown (0.18.1) + card (= 1.108.1) kramdown (~> 2.4) kramdown-syntax-coderay (~> 1.0) - card-mod-monkey (0.15.6) + card-mod-monkey (0.18.1) better_errors (~> 2.9) break (~> 0.30) - card (= 1.105.6) + card (= 1.108.1) html2haml (~> 2.2) pry-rails (~> 0.3) pry-rescue (~> 1.5) pry-stack_explorer (~> 0.6) rubocop (~> 1.17) - card-mod-permissions (0.15.6) - card (= 1.105.6) - card-mod-platypus (0.15.6) - card (= 1.105.6) + card-mod-permissions (0.18.1) + card (= 1.108.1) + card-mod-platypus (0.18.1) + card (= 1.108.1) fog-aws (~> 3.10) + rake-hooks (~> 1.1) yard (~> 0.9) - card-mod-recaptcha (0.15.6) - card (= 1.105.6) + card-mod-recaptcha (0.18.1) + card (= 1.108.1) recaptcha (~> 4.13.1) - card-mod-rules (0.15.6) - card (= 1.105.6) - card-mod-format (= 0.15.6) - card-mod-search (= 0.15.6) - card-mod-script (0.15.6) - card (= 1.105.6) - card-mod-assets (= 0.15.6) - card-mod-list (= 0.15.6) - card-mod-search (0.15.6) - card (= 1.105.6) - card-mod-collection (= 0.15.6) - card-mod-format (= 0.15.6) - card-mod-help (= 0.15.6) - card-mod-session (0.15.6) - card (= 1.105.6) - card-mod-list (= 0.15.6) - card-mod-style (0.15.6) - card (= 1.105.6) - card-mod-assets (= 0.15.6) - card-mod-list (= 0.15.6) - card-mod-tabs (0.15.6) - card (= 1.105.6) - card-mod-bootstrap (= 0.15.6) - card-mod-tinymce_editor (0.15.6) - card (= 1.105.6) - card-mod-edit (= 0.15.6) - card-mod-virtual (0.15.6) - card (= 1.105.6) + card-mod-rules (0.18.1) + card (= 1.108.1) + card-mod-format (= 0.18.1) + card-mod-search (= 0.18.1) + card-mod-script (0.18.1) + card (= 1.108.1) + card-mod-assets (= 0.18.1) + card-mod-list (= 0.18.1) + card-mod-search (0.18.1) + card (= 1.108.1) + card-mod-collection (= 0.18.1) + card-mod-format (= 0.18.1) + card-mod-help (= 0.18.1) + card-mod-session (0.18.1) + card (= 1.108.1) + card-mod-list (= 0.18.1) + card-mod-style (0.18.1) + card (= 1.108.1) + card-mod-assets (= 0.18.1) + card-mod-list (= 0.18.1) + card-mod-tabs (0.18.1) + card (= 1.108.1) + card-mod-bootstrap (= 0.18.1) + card-mod-tinymce_editor (0.18.1) + card (= 1.108.1) + card-mod-edit (= 0.18.1) + card-mod-virtual (0.18.1) + card (= 1.108.1) PATH remote: vendor/decko specs: - card (1.105.6) - actionmailbox (~> 6.1.4) - actionmailer (~> 6.1.4) - actionview (~> 6.1.4) - activejob (~> 6.1.4) - activerecord (~> 6.1.4) + card (1.108.1) + actionmailbox (~> 7.1) + actionmailer (~> 7.1) + actionview (~> 7.1) + activejob (~> 7.1) + activerecord (~> 7.1) activerecord-import (~> 1.1) - activestorage (~> 6.1.4) + activestorage (~> 7.1) bootstrap4-kaminari-views (~> 1.0) - cardname (= 0.15.6) + cardname (= 0.18.1) coderay (~> 1.1) coffee-script (~> 2.4) colorize (~> 0.8) @@ -211,7 +213,7 @@ PATH haml (~> 5.2) jwt (~> 2.2) kaminari (~> 1.2) - railties (~> 6.1.4) + railties (~> 7.1) rake (~> 13.0) sass (~> 3.7.4) sassc (~> 2.4) @@ -220,102 +222,116 @@ PATH timecop (~> 0.9) uglifier (~> 4.2) zeitwerk (!= 2.5.0) - cardname (0.15.6) - activesupport (~> 6.1) + cardname (0.18.1) + activesupport (~> 7.1) htmlentities (~> 4.3) - decko (0.15.6) - actionpack (~> 6.1.4) - card (= 1.105.6) - card-mod-defaults (= 0.15.6) + decko (0.18.1) + actionpack (~> 7.1) + card (= 1.108.1) + card-mod-defaults (= 0.18.1) GEM remote: http://rubygems.org/ specs: - actioncable (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + actioncable (7.2.2) + actionpack (= 7.2.2) + activesupport (= 7.2.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) - mail (>= 2.7.1) - actionmailer (6.1.7.6) - actionpack (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activesupport (= 6.1.7.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) - rack (~> 2.0, >= 2.0.9) + zeitwerk (~> 2.6) + actionmailbox (7.2.2) + actionpack (= 7.2.2) + activejob (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) + mail (>= 2.8.0) + actionmailer (7.2.2) + actionpack (= 7.2.2) + actionview (= 7.2.2) + activejob (= 7.2.2) + activesupport (= 7.2.2) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (7.2.2) + actionview (= 7.2.2) + activesupport (= 7.2.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.2) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.6) - actionpack (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (7.2.2) + actionpack (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) + actionview (7.2.2) + activesupport (= 7.2.2) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.6) - activesupport (= 6.1.7.6) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.2.2) + activesupport (= 7.2.2) globalid (>= 0.3.6) - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) - activerecord (6.1.7.6) - activemodel (= 6.1.7.6) - activesupport (= 6.1.7.6) - activerecord-import (1.5.1) + activemodel (7.2.2) + activesupport (= 7.2.2) + activerecord (7.2.2) + activemodel (= 7.2.2) + activesupport (= 7.2.2) + timeout (>= 0.4.0) + activerecord-import (1.8.1) activerecord (>= 4.2) - activestorage (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activesupport (= 6.1.7.6) + activestorage (7.2.2) + actionpack (= 7.2.2) + activejob (= 7.2.2) + activerecord (= 7.2.2) + activesupport (= 7.2.2) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (6.1.7.6) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (7.2.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + airbrussh (1.5.3) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) base64 (0.2.0) - bcrypt_pbkdf (1.1.0) + bcrypt_pbkdf (1.1.1) + benchmark (0.4.0) better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) - binding_of_caller (1.0.0) - debug_inspector (>= 0.0.1) + bigdecimal (3.1.8) + binding_of_caller (1.0.1) + debug_inspector (>= 1.2.0) bootstrap4-kaminari-views (1.0.1) kaminari (>= 0.13) rails (>= 3.1) break (0.40.0) - builder (3.2.4) - capistrano (3.18.0) + builder (3.3.0) + capistrano (3.19.2) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (2.1.0) + capistrano-bundler (2.1.1) capistrano (~> 3.1) capistrano-git-with-submodules (2.0.6) capistrano (~> 3.7) @@ -323,13 +339,12 @@ GEM capistrano (>= 3.0) capistrano-passenger (0.2.1) capistrano (~> 3.0) - carrierwave (2.2.5) - activemodel (>= 5.0.0) - activesupport (>= 5.0.0) + carrierwave (3.0.7) + activemodel (>= 6.0.0) + activesupport (>= 6.0.0) addressable (~> 2.6) image_processing (~> 1.1) marcel (~> 1.0.0) - mini_mime (>= 0.1.3) ssrf_filter (~> 1.0) coderay (1.1.3) coffee-script (2.4.1) @@ -337,36 +352,39 @@ GEM execjs coffee-script-source (1.12.2) colorize (0.8.1) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) crass (1.0.6) daemons (1.4.1) - dalli (3.2.6) - date (3.3.4) + dalli (3.2.8) + date (3.4.1) debug_inspector (1.2.0) - delayed_job (4.1.11) - activesupport (>= 3.0, < 8.0) - delayed_job_active_record (4.1.8) - activerecord (>= 3.0, < 8.0) + delayed_job (4.1.13) + activesupport (>= 3.0, < 9.0) + delayed_job_active_record (4.1.11) + activerecord (>= 3.0, < 9.0) delayed_job (>= 3.0, < 5) delayed_job_web (1.4.4) activerecord (> 3.0.0) delayed_job (> 2.0.3) rack-protection (>= 1.5.5) sinatra (>= 1.4.4) - diff-lcs (1.5.0) + diff-lcs (1.5.1) + drb (2.2.1) ed25519 (1.3.0) - erubi (1.12.0) + erubi (1.13.0) erubis (2.7.0) - excon (0.109.0) - execjs (2.9.1) - ffi (1.16.3) - fog-aws (3.21.0) - fog-core (~> 2.1) + excon (1.2.2) + execjs (2.10.0) + ffi (1.17.0) + fog-aws (3.29.0) + base64 (~> 0.2.0) + fog-core (~> 2.6) fog-json (~> 1.1) fog-xml (~> 0.1) - fog-core (2.4.0) + fog-core (2.6.0) builder - excon (~> 0.71) + excon (~> 1.0) formatador (>= 0.2, < 2.0) mime-types fog-json (1.2.0) @@ -387,14 +405,19 @@ GEM nokogiri (>= 1.6.0) ruby_parser (~> 3.5) htmlentities (4.3.4) - i18n (1.14.1) + i18n (1.14.6) concurrent-ruby (~> 1.0) - image_processing (1.12.2) + image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) interception (0.5) - json (2.7.1) - jwt (2.7.1) + io-console (0.8.0) + irb (1.14.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + json (2.9.0) + jwt (2.9.3) + base64 kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -407,13 +430,14 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kramdown (2.4.0) - rexml + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-syntax-coderay (1.0.1) coderay (~> 1.1) kramdown (~> 2.0) language_server-protocol (3.17.0.3) - loofah (2.22.0) + logger (1.6.2) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -422,19 +446,19 @@ GEM net-pop net-smtp marcel (1.0.2) - method_source (1.0.0) - mime-types (3.5.2) + method_source (1.1.0) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2023.1205) - mini_magick (4.12.0) + mime-types-data (3.2024.1203) + mini_magick (4.13.2) mini_mime (1.1.5) - mini_portile2 (2.8.5) - minitest (5.21.2) + mini_portile2 (2.8.8) + minitest (5.25.4) multi_json (1.15.0) - mustermann (3.0.0) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - mutex_m (0.2.0) - mysql2 (0.5.5) + mysql2 (0.5.6) net-imap (0.3.7) date net-protocol @@ -446,94 +470,110 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol - net-ssh (7.2.1) - nio4r (2.7.0) - nokogiri (1.16.0) + net-ssh (7.3.0) + nio4r (2.7.4) + nokogiri (1.16.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) - parallel (1.24.0) - parser (3.3.0.5) + ostruct (0.6.1) + parallel (1.26.3) + parser (3.3.6.0) ast (~> 2.4.1) racc - pry (0.14.2) + pry (0.15.0) coderay (~> 1.1) method_source (~> 1.0) - pry-rails (0.3.9) - pry (>= 0.10.4) + pry-rails (0.3.11) + pry (>= 0.13.0) pry-rescue (1.6.0) interception (>= 0.5) pry (>= 0.12.0) pry-stack_explorer (0.6.1) binding_of_caller (~> 1.0) pry (~> 0.13) - public_suffix (5.0.4) - puma (6.4.2) + psych (5.2.1) + date + stringio + public_suffix (6.0.1) + puma (6.5.0) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.8) + racc (1.8.1) + rack (2.2.10) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) + rack-session (1.0.2) + rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.6) - actioncable (= 6.1.7.6) - actionmailbox (= 6.1.7.6) - actionmailer (= 6.1.7.6) - actionpack (= 6.1.7.6) - actiontext (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activemodel (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.2.2) + actioncable (= 7.2.2) + actionmailbox (= 7.2.2) + actionmailer (= 7.2.2) + actionpack (= 7.2.2) + actiontext (= 7.2.2) + actionview (= 7.2.2) + activejob (= 7.2.2) + activemodel (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) bundler (>= 1.15.0) - railties (= 6.1.7.6) - sprockets-rails (>= 2.0.0) + railties (= 7.2.2) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.1) loofah (~> 2.21) - nokogiri (~> 1.14) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) - method_source + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (7.2.2) + actionpack (= 7.2.2) + activesupport (= 7.2.2) + irb (~> 1.13) + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.1) + rake-hooks (1.2.3) + rake rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) + rdoc (6.8.1) + psych (>= 4.0.0) recaptcha (4.13.2) json - regexp_parser (2.9.0) - rexml (3.2.6) - rouge (4.2.0) - rubocop (1.60.1) + regexp_parser (2.9.3) + reline (0.5.12) + io-console (~> 0.5) + rexml (3.3.9) + rouge (4.5.1) + rubocop (1.69.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.36.2, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.36.2) + parser (>= 3.3.1.0) ruby-progressbar (1.13.0) - ruby-vips (2.2.0) + ruby-vips (2.2.2) ffi (~> 1.12) + logger ruby2_keywords (0.0.5) - ruby_parser (3.21.0) + ruby_parser (3.21.1) racc (~> 1.5) sexp_processor (~> 4.16) sass (3.7.4) @@ -545,43 +585,51 @@ GEM ffi (~> 1.9) sassc (2.4.0-x64-mingw32) ffi (~> 1.9) - sexp_processor (4.17.1) + securerandom (0.4.0) + sexp_processor (4.17.3) sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) rack-protection (= 3.2.0) tilt (~> 2.0) - sprockets (3.7.2) + sprockets (3.7.5) + base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - sshkit (1.22.0) - mutex_m + sshkit (1.23.2) + base64 net-scp (>= 1.1.2) net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) - ssrf_filter (1.0.8) + ostruct + ssrf_filter (1.2.0) staccato (0.5.3) + stringio (3.1.2) temple (0.10.3) - thor (1.3.0) - tilt (2.3.0) - timecop (0.9.8) - timeout (0.4.1) + thor (1.3.2) + tilt (2.4.0) + timecop (0.9.10) + timeout (0.4.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.4) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uglifier (4.2.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) - unicode-display_width (2.5.0) + unicode-display_width (3.1.2) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) + useragent (0.16.11) + webrick (1.9.1) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - yard (0.9.34) - zeitwerk (2.6.12) + yard (0.9.37) + zeitwerk (2.7.1) PLATFORMS ruby diff --git a/vendor/decko b/vendor/decko index c417f8d..d191da8 160000 --- a/vendor/decko +++ b/vendor/decko @@ -1 +1 @@ -Subproject commit c417f8d2899e10f49d939717711697a18c2d8e4a +Subproject commit d191da8a319e3d724870a43050b79707a225009c diff --git a/vendor/decko-cap b/vendor/decko-cap deleted file mode 160000 index c3c552c..0000000 --- a/vendor/decko-cap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c3c552c1c73da538e8d8ddd7f22186049c13cb30 From 061a641d479aa0f8331c4a541213b6df7574af41 Mon Sep 17 00:00:00 2001 From: Ethan McCutchen Date: Thu, 5 Dec 2024 14:28:24 -0500 Subject: [PATCH 2/7] added docker build --- .github/workflows/docker-build.yaml | 40 +++++++++++++++++++++++++++++ Rakefile | 2 +- config.ru | 2 +- config/environment.rb | 2 +- vendor/decko | 2 +- 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/docker-build.yaml diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml new file mode 100644 index 0000000..b8341a4 --- /dev/null +++ b/.github/workflows/docker-build.yaml @@ -0,0 +1,40 @@ +name: Build and publish Docker image + +on: + push: + branches: [ main, staging ] + +jobs: + build-and-push-image: + runs-on: ubuntu-latest + + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v4.2.2 + + - name: Log in to the Container registry + uses: docker/login-action@v3.3.0 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata for Docker + id: meta + uses: docker/metadata-action@v5.5.1 + with: + images: ghcr.io/${{ github.repository }} + tags: | + type=raw,value={{sha}} + + - name: Build and push Docker image + uses: docker/build-push-action@v6.9.0 + with: + push: true + file: vendor/decko/docker/repos/decko-k8s.dockerfile + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/Rakefile b/Rakefile index 7d25680..58857a1 100644 --- a/Rakefile +++ b/Rakefile @@ -4,4 +4,4 @@ require File.expand_path('../config/application', __FILE__) -WikirateProject::Application.load_tasks +Cardio.application.class.load_tasks diff --git a/config.ru b/config.ru index 854d063..17b8510 100644 --- a/config.ru +++ b/config.ru @@ -1,4 +1,4 @@ # This file is used by Rack-based servers to start the application. require ::File.expand_path('../config/environment', __FILE__) -run WikirateProject::Application +run Cardio.application.class diff --git a/config/environment.rb b/config/environment.rb index 5ed6c4c..3031164 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,4 +2,4 @@ require File.expand_path('../application', __FILE__) # Initialize the rails application -WikirateProject::Application.initialize! +Cardio.application.class.initialize! diff --git a/vendor/decko b/vendor/decko index d191da8..70f68d7 160000 --- a/vendor/decko +++ b/vendor/decko @@ -1 +1 @@ -Subproject commit d191da8a319e3d724870a43050b79707a225009c +Subproject commit 70f68d71f04729d57a6e754574620d68e93da50d From 942eec00dc07bd6d58709879cd6c3c376af191a3 Mon Sep 17 00:00:00 2001 From: Ethan McCutchen Date: Fri, 6 Dec 2024 13:40:17 -0500 Subject: [PATCH 3/7] decko tick --- vendor/decko | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/decko b/vendor/decko index 70f68d7..eca22cf 160000 --- a/vendor/decko +++ b/vendor/decko @@ -1 +1 @@ -Subproject commit 70f68d71f04729d57a6e754574620d68e93da50d +Subproject commit eca22cfa7f29ed893c40e36fc4013b58499c57ed From 441e16d1396dfbefcba90a268c87202ad57a25d2 Mon Sep 17 00:00:00 2001 From: Ethan McCutchen Date: Fri, 6 Dec 2024 14:14:53 -0500 Subject: [PATCH 4/7] decko tick --- vendor/decko | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/decko b/vendor/decko index eca22cf..a883506 160000 --- a/vendor/decko +++ b/vendor/decko @@ -1 +1 @@ -Subproject commit eca22cfa7f29ed893c40e36fc4013b58499c57ed +Subproject commit a8835068763be395625f5637d5ea4e26d9bd0c64 From 451cdf4ae063ba34d80b3bd15b9d0ae7f47a3302 Mon Sep 17 00:00:00 2001 From: Ethan McCutchen Date: Mon, 3 Feb 2025 11:19:59 -0500 Subject: [PATCH 5/7] gem and vendor updates --- Gemfile | 3 +- Gemfile.lock | 234 ++++++++++++++++++++++----------------------------- vendor/decko | 2 +- 3 files changed, 103 insertions(+), 136 deletions(-) diff --git a/Gemfile b/Gemfile index 29f4620..bbb2c25 100644 --- a/Gemfile +++ b/Gemfile @@ -20,6 +20,7 @@ end path "./vendor/card-mods" do gem "card-mod-social" gem "card-mod-filter" + gem "card-mod-new_relic" gem "card-mod-thumbnail" gem "card-mod-google_analytics" end @@ -31,8 +32,6 @@ group :development do gem "card-mod-platypus" gem "card-mod-monkey" end - - gem "decko-cap", path: "./vendor/decko-cap" end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index b8060bd..34ccbe3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,25 +8,16 @@ PATH card-mod-google_analytics (0.16) card staccato (~> 0.5) + card-mod-new_relic (0.2) + card + decko + newrelic_rpm card-mod-social (0.2) card card-mod-thumbnail (0.1) card card-mod-bar_and_box -PATH - remote: vendor/decko-cap - specs: - decko-cap (0.1) - airbrussh - bcrypt_pbkdf - capistrano - capistrano-bundler - capistrano-git-with-submodules (~> 2.0) - capistrano-maintenance - capistrano-passenger - ed25519 - PATH remote: vendor/decko/mod specs: @@ -233,29 +224,29 @@ PATH GEM remote: http://rubygems.org/ specs: - actioncable (7.2.2) - actionpack (= 7.2.2) - activesupport (= 7.2.2) + actioncable (7.2.2.1) + actionpack (= 7.2.2.1) + activesupport (= 7.2.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.2.2) - actionpack (= 7.2.2) - activejob (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) + actionmailbox (7.2.2.1) + actionpack (= 7.2.2.1) + activejob (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) mail (>= 2.8.0) - actionmailer (7.2.2) - actionpack (= 7.2.2) - actionview (= 7.2.2) - activejob (= 7.2.2) - activesupport (= 7.2.2) + actionmailer (7.2.2.1) + actionpack (= 7.2.2.1) + actionview (= 7.2.2.1) + activejob (= 7.2.2.1) + activesupport (= 7.2.2.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.2.2) - actionview (= 7.2.2) - activesupport (= 7.2.2) + actionpack (7.2.2.1) + actionview (= 7.2.2.1) + activesupport (= 7.2.2.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4, < 3.2) @@ -264,37 +255,37 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (7.2.2) - actionpack (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) + actiontext (7.2.2.1) + actionpack (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.2.2) - activesupport (= 7.2.2) + actionview (7.2.2.1) + activesupport (= 7.2.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.2.2) - activesupport (= 7.2.2) + activejob (7.2.2.1) + activesupport (= 7.2.2.1) globalid (>= 0.3.6) - activemodel (7.2.2) - activesupport (= 7.2.2) - activerecord (7.2.2) - activemodel (= 7.2.2) - activesupport (= 7.2.2) + activemodel (7.2.2.1) + activesupport (= 7.2.2.1) + activerecord (7.2.2.1) + activemodel (= 7.2.2.1) + activesupport (= 7.2.2.1) timeout (>= 0.4.0) activerecord-import (1.8.1) activerecord (>= 4.2) - activestorage (7.2.2) - actionpack (= 7.2.2) - activejob (= 7.2.2) - activerecord (= 7.2.2) - activesupport (= 7.2.2) + activestorage (7.2.2.1) + actionpack (= 7.2.2.1) + activejob (= 7.2.2.1) + activerecord (= 7.2.2.1) + activesupport (= 7.2.2.1) marcel (~> 1.0) - activesupport (7.2.2) + activesupport (7.2.2.1) base64 benchmark (>= 0.3) bigdecimal @@ -308,17 +299,14 @@ GEM tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - airbrussh (1.5.3) - sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) base64 (0.2.0) - bcrypt_pbkdf (1.1.1) benchmark (0.4.0) better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) - bigdecimal (3.1.8) + bigdecimal (3.1.9) binding_of_caller (1.0.1) debug_inspector (>= 1.2.0) bootstrap4-kaminari-views (1.0.1) @@ -326,20 +314,7 @@ GEM rails (>= 3.1) break (0.40.0) builder (3.3.0) - capistrano (3.19.2) - airbrussh (>= 1.0.0) - i18n - rake (>= 10.0.0) - sshkit (>= 1.9.0) - capistrano-bundler (2.1.1) - capistrano (~> 3.1) - capistrano-git-with-submodules (2.0.6) - capistrano (~> 3.7) - capistrano-maintenance (1.2.1) - capistrano (>= 3.0) - capistrano-passenger (0.2.1) - capistrano (~> 3.0) - carrierwave (3.0.7) + carrierwave (3.1.1) activemodel (>= 6.0.0) activesupport (>= 6.0.0) addressable (~> 2.6) @@ -352,8 +327,8 @@ GEM execjs coffee-script-source (1.12.2) colorize (0.8.1) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) crass (1.0.6) daemons (1.4.1) dalli (3.2.8) @@ -371,13 +346,12 @@ GEM sinatra (>= 1.4.4) diff-lcs (1.5.1) drb (2.2.1) - ed25519 (1.3.0) - erubi (1.13.0) + erubi (1.13.1) erubis (2.7.0) - excon (1.2.2) + excon (1.2.3) execjs (2.10.0) - ffi (1.17.0) - fog-aws (3.29.0) + ffi (1.17.1) + fog-aws (3.30.0) base64 (~> 0.2.0) fog-core (~> 2.6) fog-json (~> 1.1) @@ -390,7 +364,7 @@ GEM fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-xml (0.1.4) + fog-xml (0.1.5) fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (1.1.0) @@ -405,18 +379,19 @@ GEM nokogiri (>= 1.6.0) ruby_parser (~> 3.5) htmlentities (4.3.4) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) interception (0.5) io-console (0.8.0) - irb (1.14.1) + irb (1.15.1) + pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.9.0) - jwt (2.9.3) + json (2.9.1) + jwt (2.10.1) base64 kaminari (1.2.2) activesupport (>= 4.1.0) @@ -435,9 +410,9 @@ GEM kramdown-syntax-coderay (1.0.1) coderay (~> 1.1) kramdown (~> 2.0) - language_server-protocol (3.17.0.3) - logger (1.6.2) - loofah (2.23.1) + language_server-protocol (3.17.0.4) + logger (1.6.5) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -450,7 +425,7 @@ GEM mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1203) + mime-types-data (3.2025.0107) mini_magick (4.13.2) mini_mime (1.1.5) mini_portile2 (2.8.8) @@ -466,23 +441,21 @@ GEM net-protocol net-protocol (0.2.2) timeout - net-scp (4.0.0) - net-ssh (>= 2.6.5, < 8.0.0) - net-sftp (4.0.0) - net-ssh (>= 5.0.0, < 8.0.0) net-smtp (0.5.0) net-protocol - net-ssh (7.3.0) + newrelic_rpm (9.17.0) nio4r (2.7.4) - nokogiri (1.16.8) + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - ostruct (0.6.1) parallel (1.26.3) - parser (3.3.6.0) + parser (3.3.7.0) ast (~> 2.4.1) racc - pry (0.15.0) + pp (0.6.2) + prettyprint + prettyprint (0.2.0) + pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) pry-rails (0.3.11) @@ -493,11 +466,11 @@ GEM pry-stack_explorer (0.6.1) binding_of_caller (~> 1.0) pry (~> 0.13) - psych (5.2.1) + psych (5.2.3) date stringio public_suffix (6.0.1) - puma (6.5.0) + puma (6.6.0) nio4r (~> 2.0) racc (1.8.1) rack (2.2.10) @@ -506,35 +479,35 @@ GEM rack (~> 2.2, >= 2.2.4) rack-session (1.0.2) rack (< 3) - rack-test (2.1.0) + rack-test (2.2.0) rack (>= 1.3) rackup (1.0.1) rack (< 3) webrick - rails (7.2.2) - actioncable (= 7.2.2) - actionmailbox (= 7.2.2) - actionmailer (= 7.2.2) - actionpack (= 7.2.2) - actiontext (= 7.2.2) - actionview (= 7.2.2) - activejob (= 7.2.2) - activemodel (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) + rails (7.2.2.1) + actioncable (= 7.2.2.1) + actionmailbox (= 7.2.2.1) + actionmailer (= 7.2.2.1) + actionpack (= 7.2.2.1) + actiontext (= 7.2.2.1) + actionview (= 7.2.2.1) + activejob (= 7.2.2.1) + activemodel (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) bundler (>= 1.15.0) - railties (= 7.2.2) + railties (= 7.2.2.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.1) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (7.2.2) - actionpack (= 7.2.2) - activesupport (= 7.2.2) + railties (7.2.2.1) + actionpack (= 7.2.2.1) + activesupport (= 7.2.2.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -547,26 +520,26 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rdoc (6.8.1) + rdoc (6.11.0) psych (>= 4.0.0) recaptcha (4.13.2) json - regexp_parser (2.9.3) - reline (0.5.12) + regexp_parser (2.10.0) + reline (0.6.0) io-console (~> 0.5) - rexml (3.3.9) + rexml (3.4.0) rouge (4.5.1) - rubocop (1.69.1) + rubocop (1.71.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.36.2, < 2.0) + rubocop-ast (>= 1.38.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.36.2) + rubocop-ast (1.38.0) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) ruby-vips (2.2.2) @@ -585,7 +558,7 @@ GEM ffi (~> 1.9) sassc (2.4.0-x64-mingw32) ffi (~> 1.9) - securerandom (0.4.0) + securerandom (0.4.1) sexp_processor (4.17.3) sinatra (3.2.0) mustermann (~> 3.0) @@ -600,32 +573,27 @@ GEM actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) - sshkit (1.23.2) - base64 - net-scp (>= 1.1.2) - net-sftp (>= 2.1.2) - net-ssh (>= 2.8.0) - ostruct ssrf_filter (1.2.0) staccato (0.5.3) stringio (3.1.2) temple (0.10.3) thor (1.3.2) - tilt (2.4.0) + tilt (2.6.0) timecop (0.9.10) - timeout (0.4.2) + timeout (0.4.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.2) + tzinfo-data (1.2025.1) tzinfo (>= 1.0.0) uglifier (4.2.1) execjs (>= 0.3.0, < 3) - unicode-display_width (3.1.2) + unicode-display_width (3.1.4) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) useragent (0.16.11) webrick (1.9.1) - websocket-driver (0.7.6) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) yard (0.9.37) @@ -642,13 +610,13 @@ DEPENDENCIES card-mod-filter! card-mod-google_analytics! card-mod-monkey! + card-mod-new_relic! card-mod-platypus! card-mod-social! card-mod-thumbnail! cardname! dalli decko! - decko-cap! fog-aws mysql2 net-imap (= 0.3.7) diff --git a/vendor/decko b/vendor/decko index a883506..c5232e3 160000 --- a/vendor/decko +++ b/vendor/decko @@ -1 +1 @@ -Subproject commit a8835068763be395625f5637d5ea4e26d9bd0c64 +Subproject commit c5232e32042080de62b66feece3cc3149374b40e From acd628edce2be4ca8dfbed879a190bf60c83dd4b Mon Sep 17 00:00:00 2001 From: Ethan McCutchen Date: Mon, 3 Feb 2025 11:22:33 -0500 Subject: [PATCH 6/7] card-mods update' --- vendor/card-mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/card-mods b/vendor/card-mods index 7e23cfb..80bbf4e 160000 --- a/vendor/card-mods +++ b/vendor/card-mods @@ -1 +1 @@ -Subproject commit 7e23cfb550e124d9712864c7005652716b4ae966 +Subproject commit 80bbf4ead41a099d0b218f083d172eb834e4eecf From 6c476bb9ea23af6363b259516b9595a3563be229 Mon Sep 17 00:00:00 2001 From: Ethan McCutchen Date: Mon, 3 Feb 2025 11:44:37 -0500 Subject: [PATCH 7/7] card-mod updates --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 34ccbe3..b4bb889 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,20 @@ PATH remote: vendor/card-mods specs: - card-mod-filter (0.2) + card-mod-filter (0.3) card card-mod-bootstrap card-mod-search - card-mod-google_analytics (0.16) + card-mod-google_analytics (0.2) card staccato (~> 0.5) - card-mod-new_relic (0.2) + card-mod-new_relic (0.3) card decko newrelic_rpm - card-mod-social (0.2) + card-mod-social (0.3) card - card-mod-thumbnail (0.1) + card-mod-thumbnail (0.2) card card-mod-bar_and_box