From 97cc0b3d6acb99f3a03fc4ffc92044349957fd42 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:07:23 +0000 Subject: [PATCH 001/118] Update tilt to version 2.6.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 788f9edf..04a6f56e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -624,7 +624,7 @@ GEM sysexits (1.2.0) temple (0.8.2) thor (1.4.0) - tilt (2.0.10) + tilt (2.6.1) timecop (0.9.4) timeout (0.4.3) transitions (1.2.1) From c5cbf38639858de17826a4bd53e9dfc657e799ea Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:08:31 +0000 Subject: [PATCH 002/118] Update chartkick to version 5.2.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 75fcc8a7..5a4621b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,7 @@ GEM caxlsx_rails (0.6.2) actionpack (>= 3.1) caxlsx (>= 3.0) - chartkick (4.1.3) + chartkick (5.2.0) childprocess (5.1.0) logger (~> 1.5) chronic (0.10.2) From 8336f0cce58ba564a627d7f36e4773a7699bb498 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:10:02 +0000 Subject: [PATCH 003/118] Update matrix to version 0.4.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d67b8005..7af20751 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -308,7 +308,7 @@ GEM net-pop net-smtp marcel (1.0.4) - matrix (0.4.2) + matrix (0.4.3) mina (1.2.4) open4 (~> 1.3.4) rake From 378ba175d5183ccdcb01125269e085d04c4c260e Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:10:54 +0000 Subject: [PATCH 004/118] Update recaptcha to version 5.20.1 --- Gemfile.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 034adf0d..35ee4a0b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -484,8 +484,7 @@ GEM rdoc (6.14.2) erb psych (>= 4.0.0) - recaptcha (5.8.1) - json + recaptcha (5.20.1) redcarpet (3.6.1) regexp_parser (2.11.1) reline (0.6.2) From 59270e0691da4aa8dda41786415ec9d329f9ec3c Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:20:38 +0000 Subject: [PATCH 005/118] Update byebug to version 12.0.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 034adf0d..0657c87c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM sassc (>= 2.0.0) bootstrap-switch-rails (3.3.3) builder (3.3.0) - byebug (11.1.3) + byebug (12.0.0) cancancan (3.3.0) capybara (3.40.0) addressable From d0cb4d01f93d02495d994010895d8657f009116b Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:30:26 +0000 Subject: [PATCH 006/118] Update rqrcode_core to version 2.0.0 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe8b52c8..6dacd614 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -496,10 +496,10 @@ GEM railties (>= 5.2) rexml (3.4.1) rolify (6.0.0) - rqrcode (2.0.0) + rqrcode (3.1.0) chunky_png (~> 1.0) - rqrcode_core (~> 1.0) - rqrcode_core (1.1.0) + rqrcode_core (~> 2.0) + rqrcode_core (2.0.0) rspec-activemodel-mocks (1.1.0) activemodel (>= 3.0) activesupport (>= 3.0) From ebf972a69b3bd0e2083d54269df249657bf983da Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:35:37 +0000 Subject: [PATCH 007/118] Update rqrcode to version 3.1.0 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe8b52c8..6dacd614 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -496,10 +496,10 @@ GEM railties (>= 5.2) rexml (3.4.1) rolify (6.0.0) - rqrcode (2.0.0) + rqrcode (3.1.0) chunky_png (~> 1.0) - rqrcode_core (~> 1.0) - rqrcode_core (1.1.0) + rqrcode_core (~> 2.0) + rqrcode_core (2.0.0) rspec-activemodel-mocks (1.1.0) activemodel (>= 3.0) activesupport (>= 3.0) From 3351030c84a81159364d923bffed39cd6e9b4052 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:41:08 +0000 Subject: [PATCH 008/118] Update io-like to version 0.4.0 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe8b52c8..a0013527 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,8 +89,8 @@ GEM afm (0.2.2) ajax-datatables-rails (1.3.1) zeitwerk - archive-zip (0.12.0) - io-like (~> 0.3.0) + archive-zip (0.13.1) + io-like (~> 0.4.0) ast (2.4.3) autoprefixer-rails (10.3.1.0) execjs (~> 2) @@ -256,7 +256,7 @@ GEM mini_magick (>= 4.9.5, < 6) ruby-vips (>= 2.0.17, < 3) io-console (0.8.1) - io-like (0.3.1) + io-like (0.4.0) irb (1.15.2) pp (>= 0.6.0) rdoc (>= 4.0.0) From 326640662664f6655fe7e52f6c3dff24261a16e1 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:45:59 +0000 Subject: [PATCH 009/118] Update afm to version 1.0.0 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe8b52c8..d963ce71 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM activerecord (>= 4.2) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - afm (0.2.2) + afm (1.0.0) ajax-datatables-rails (1.3.1) zeitwerk archive-zip (0.12.0) @@ -396,9 +396,9 @@ GEM pdf-core (0.10.0) pdf-inspector (1.3.0) pdf-reader (>= 1.0, < 3.0.a) - pdf-reader (2.14.1) + pdf-reader (2.15.0) Ascii85 (>= 1.0, < 3.0, != 2.0.0) - afm (~> 0.2.1) + afm (>= 0.2.1, < 2) hashery (~> 2.0) ruby-rc4 ttfunk From 3c7ec664c1a85958d424bf5b210fbe521185a0b1 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:50:30 +0000 Subject: [PATCH 010/118] Update archive-zip to version 0.13.1 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe8b52c8..a0013527 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,8 +89,8 @@ GEM afm (0.2.2) ajax-datatables-rails (1.3.1) zeitwerk - archive-zip (0.12.0) - io-like (~> 0.3.0) + archive-zip (0.13.1) + io-like (~> 0.4.0) ast (2.4.3) autoprefixer-rails (10.3.1.0) execjs (~> 2) @@ -256,7 +256,7 @@ GEM mini_magick (>= 4.9.5, < 6) ruby-vips (>= 2.0.17, < 3) io-console (0.8.1) - io-like (0.3.1) + io-like (0.4.0) irb (1.15.2) pp (>= 0.6.0) rdoc (>= 4.0.0) From aaff07e48b56b047fe92db4af02c11e6fa2d4eb4 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 10 Jun 2025 12:21:56 +0200 Subject: [PATCH 011/118] Put the ticket token into the registration export --- app/views/admin/registrations/index.xlsx.axlsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/admin/registrations/index.xlsx.axlsx b/app/views/admin/registrations/index.xlsx.axlsx index a95c163e..596d9fd2 100644 --- a/app/views/admin/registrations/index.xlsx.axlsx +++ b/app/views/admin/registrations/index.xlsx.axlsx @@ -3,7 +3,7 @@ wb = xlsx_package.workbook wb.add_worksheet(name: 'registrations') do |sheet| bold_style = wb.styles.add_style(b: true) - row = ['Attended', 'Name', 'Nickname', 'Affilιation', 'Email'] + row = ['Attended', 'Name', 'Nickname', 'Affilιation', 'Email', 'Ticket Token'] @conference.questions.each do |question| row << question.title @@ -18,6 +18,7 @@ wb.add_worksheet(name: 'registrations') do |sheet| row << registration.nickname row << registration.affiliation row << registration.email + row << registration.user.physical_tickets.by_conference(@conference).first&.token @conference.questions.each do |question| qa = registration.qanswers.find_by(question: question) answer = ( qa ? qa.answer.title : '' ) From 6668f90910f1421290b10127964cdf03484e9214 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 14 Aug 2025 10:16:04 +0000 Subject: [PATCH 012/118] Update rspec-activemodel-mocks to version 1.3.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 345cd3e7..f2653ff5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -500,7 +500,7 @@ GEM chunky_png (~> 1.0) rqrcode_core (~> 2.0) rqrcode_core (2.0.0) - rspec-activemodel-mocks (1.1.0) + rspec-activemodel-mocks (1.3.0) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) From d8faa3afc3858442204d859cdd8fcace7c8c62f4 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:55:26 +0000 Subject: [PATCH 013/118] Update haml_lint to version 0.65.1 --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 345cd3e7..8bd725bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -228,11 +228,11 @@ GEM haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) railties (>= 5.1) - haml_lint (0.37.1) - haml (>= 4.0, < 5.3) + haml_lint (0.65.1) + haml (>= 5.0) parallel (~> 1.10) rainbow - rubocop (>= 0.50.0) + rubocop (>= 1.0) sysexits (~> 1.1) hashdiff (1.0.1) hashery (2.1.2) @@ -486,7 +486,7 @@ GEM psych (>= 4.0.0) recaptcha (5.20.1) redcarpet (3.6.1) - regexp_parser (2.11.1) + regexp_parser (2.11.2) reline (0.6.2) io-console (~> 0.5) request_store (1.7.0) From 762809b03101946f4f5a6cf52a0769e52e32ba4e Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 13:45:59 +0000 Subject: [PATCH 014/118] Update json-schema to version 6.0.0 --- Gemfile.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3e0774ee..4bcc1c73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,8 +275,9 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.13.2) - json-schema (2.8.1) - addressable (>= 2.4) + json-schema (6.0.0) + addressable (~> 2.8) + bigdecimal (~> 3.1) jsonapi-renderer (0.2.2) jwt (3.1.2) base64 From 2756a9e84b20df11e17b6bde9540c011b76c8e31 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 09:29:36 +0000 Subject: [PATCH 015/118] Update rubocop-rails to version 2.33.3 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3e0774ee..0cbf8c42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -545,7 +545,7 @@ GEM lint_roller (~> 1.1) rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.38.0, < 2.0) - rubocop-rails (2.33.1) + rubocop-rails (2.33.3) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) @@ -636,7 +636,7 @@ GEM concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (3.1.4) + unicode-display_width (3.1.5) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) unobtrusive_flash (3.3.1) From 0af86f55c32a399b344a2096b4d817c3a06b5bd1 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 09:32:18 +0000 Subject: [PATCH 016/118] Update haml-rails to version 2.1.0 --- Gemfile.lock | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3e0774ee..ad4d53d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -190,7 +190,6 @@ GEM drb (2.2.3) erb (5.0.2) erubi (1.13.1) - erubis (2.7.0) execjs (2.8.1) factory_bot (6.5.4) activesupport (>= 6.1.0) @@ -219,14 +218,14 @@ GEM globalid (1.2.1) activesupport (>= 6.1) gravtastic (3.2.6) - haml (5.2.2) - temple (>= 0.8.0) + haml (6.3.0) + temple (>= 0.8.2) + thor tilt - haml-rails (2.0.1) + haml-rails (2.1.0) actionpack (>= 5.1) activesupport (>= 5.1) - haml (>= 4.0.6, < 6.0) - html2haml (>= 1.0.1) + haml (>= 4.0.6) railties (>= 5.1) haml_lint (0.65.1) haml (>= 5.0) @@ -237,11 +236,6 @@ GEM hashdiff (1.0.1) hashery (2.1.2) hashie (5.0.0) - html2haml (2.2.0) - erubis (~> 2.7.0) - haml (>= 4.0, < 6) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) htmlentities (4.3.4) i18n (1.14.7) concurrent-ruby (~> 1.0) @@ -565,8 +559,6 @@ GEM ruby-vips (2.2.4) ffi (~> 1.12) logger - ruby_parser (3.17.0) - sexp_processor (~> 4.15, >= 4.15.1) rubyzip (2.4.1) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -590,7 +582,6 @@ GEM sentry-ruby (5.26.0) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sexp_processor (4.15.3) shoulda-matchers (6.5.0) activesupport (>= 5.2.0) simplecov (0.22.0) From d45e6797cf137114783624473952388722b6558a Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 21 Aug 2025 00:46:05 +0000 Subject: [PATCH 017/118] Update haml_lint to version 0.66.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ad4d53d9..7c4fb9bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -227,7 +227,7 @@ GEM activesupport (>= 5.1) haml (>= 4.0.6) railties (>= 5.1) - haml_lint (0.65.1) + haml_lint (0.66.0) haml (>= 5.0) parallel (~> 1.10) rainbow @@ -627,7 +627,7 @@ GEM concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (3.1.4) + unicode-display_width (3.1.5) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) unobtrusive_flash (3.3.1) From ff140c1969b11b1e1c022c0ad65fd4195959447d Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Sat, 23 Aug 2025 07:15:48 +0000 Subject: [PATCH 018/118] Update caxlsx to version 4.3.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ad4d53d9..99187a5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,11 +130,11 @@ GEM fastimage case_transform (0.2) activesupport - caxlsx (4.2.0) + caxlsx (4.3.0) htmlentities (~> 4.3, >= 4.3.4) marcel (~> 1.0) nokogiri (~> 1.10, >= 1.10.4) - rubyzip (>= 1.3.0, < 3) + rubyzip (>= 2.4, < 4) caxlsx_rails (0.6.2) actionpack (>= 3.1) caxlsx (>= 3.0) From 9d4cf0799eeca7174bec00b4fa3d4aac1eec4973 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 26 Aug 2025 20:16:22 +0000 Subject: [PATCH 019/118] Update mini_magick to version 5.3.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 01d4ff39..0dc2255a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -310,7 +310,7 @@ GEM mina (1.2.4) open4 (~> 1.3.4) rake - mini_magick (5.3.0) + mini_magick (5.3.1) logger mini_mime (1.1.5) mini_portile2 (2.8.9) From 1ab2b3b276e48274fa1a9ea87df85d4e77aefdcc Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 27 Aug 2025 13:16:00 +0000 Subject: [PATCH 020/118] Update ruby-vips to version 2.2.5 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0dc2255a..1bbb7002 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -557,7 +557,7 @@ GEM ruby-openid (2.9.2) ruby-progressbar (1.13.0) ruby-rc4 (0.1.5) - ruby-vips (2.2.4) + ruby-vips (2.2.5) ffi (~> 1.12) logger rubyzip (2.4.1) From 0540401c71781096b83aad37a883de082ae4cf9a Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 01:45:40 +0000 Subject: [PATCH 021/118] Update simplecov-cobertura to version 3.1.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1bbb7002..d0550e3e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -489,7 +489,7 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.4.1) + rexml (3.4.2) rolify (6.0.0) rqrcode (3.1.0) chunky_png (~> 1.0) @@ -589,7 +589,7 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-cobertura (3.0.0) + simplecov-cobertura (3.1.0) rexml simplecov (~> 0.19) simplecov-html (0.13.2) From 270cd76e45d2b93103b9134cdc5892e3cc9529cb Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Thu, 4 Sep 2025 14:01:25 +0200 Subject: [PATCH 022/118] Remove heroku/railway configuration No one here uses this anymore so no one maintains it. --- INSTALL.md | 9 +++++---- app.json | 37 ------------------------------------- railway.json | 11 ----------- 3 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 app.json delete mode 100644 railway.json diff --git a/INSTALL.md b/INSTALL.md index 629f756a..ffb5a024 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -26,11 +26,12 @@ You can find the latest OSEM releases on our [release page](https://github.com/o ## Deploy to the cloud -The easiest way to deploy OSEM is to use one of the many platform as a service providers that support ruby on rails. We have prepared OSEM to be used with [heroku](https://heroku.com). So if you have an account there, you can deploy OSEM by pressing this button: +The easiest way to deploy OSEM is to use one of the many platform as a service (PaaS) providers that support Ruby on Rails. +There are too many to list, here are a few we have seen OSEM deployed to: - - Deploy - +- https://heroku.com +- https://render.com +- https://fly.io ## Deploy to your own server diff --git a/app.json b/app.json deleted file mode 100644 index b1af6d6b..00000000 --- a/app.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "osem", - "description": "Open Source Event Manager", - "repository": "https://github.com/openSUSE/osem", - "env": { - "CLOUDINARY_URL": { - "description": "Create a https://cloudinary.com account and set the cloud url here. It starts with cloudinary://", - "required": false - }, - "SECRET_KEY_BASE": { - "description": "A key to verify sessions. At least 40 characters. For instance: https://www.randomlists.com/string?base=16&length=64&qty=1", - "generator": "secret" - }, - "NOKOGIRI_USE_SYSTEM_LIBRARIES": "1", - "RAILS_ENV": "production", - "RACK_ENV": "production" - }, - "scripts": { - "postdeploy": "bundle exec rake db:schema:load db:seed" - }, - "formation": { - "web": { - "quantity": 1 - }, - "worker": { - "quantity": 1 - } - }, - "addons": [ - { - "plan": "heroku-postgresql" - }, - { - "plan": "sendgrid" - } - ] -} diff --git a/railway.json b/railway.json deleted file mode 100644 index f5fa5619..00000000 --- a/railway.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "$schema": "https://railway.app/railway.schema.json", - "build": { - "builder": "nixpacks" - }, - "deploy": { - "startCommand": "foreman start -p 3000", - "restartPolicyType": "ON_FAILURE", - "restartPolicyMaxRetries": 2 - } -} From 93662dc489fd3fefe55e5ef341d671cc66548535 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Thu, 4 Sep 2025 17:10:33 +0200 Subject: [PATCH 023/118] Adapt Dockerfile.productiono to openSUSE Leap 15.6 - No need to manually install bundler anymore - bundle to vendor/bundle - build nokogiri against system libraries - expose the port foreman is using - serve static files --- Dockerfile.production | 18 +++++++++++++----- INSTALL.md | 7 ++++--- docker-compose.yml.production-example | 17 +++++++++-------- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/Dockerfile.production b/Dockerfile.production index 8192c8f0..f52ea3b3 100644 --- a/Dockerfile.production +++ b/Dockerfile.production @@ -1,20 +1,28 @@ FROM registry.opensuse.org/opensuse/infrastructure/dale/containers/osem/base:latest +EXPOSE 5000 + ENV RAILS_ENV=production +ENV RAILS_SERVE_STATIC_FILES=true # Add our files COPY --chown=1000:1000 . /osem/ -# Install bundler & foreman -RUN gem install bundler -v "$(grep -A 1 "BUNDLED WITH" /osem/Gemfile.lock | tail -n 1)"; \ - gem install foreman +# Install foreman +RUN gem install foreman USER osem WORKDIR /osem/ +RUN rm -rf /osem/public/system/sponsors; mkdir -p /osem/public/system/sponsors; \ + rm -rf /osem/public/assets; mkdir -p /osem/public/assets; \ + rm -rf /osem/log; mkdir -p /osem/public/assets + # Install our bundle -RUN bundle config set --local without 'test development' -RUN bundle install --jobs=3 --retry=3 +RUN bundle config set --local without 'test development'; \ + bundle config set --local path 'vendor/bundle'; \ + bundle config build.nokogiri --use-system-libraries; \ + bundle install --jobs=4 --retry=3 # Generate assets RUN bundle exec rake assets:precompile diff --git a/INSTALL.md b/INSTALL.md index ffb5a024..ef118842 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -37,11 +37,11 @@ There are too many to list, here are a few we have seen OSEM deployed to: We recommend to run OSEM in production with [mod\_passenger](https://www.phusionpassenger.com/download/#open_source) and the [apache web-server](https://www.apache.org/). There are tons of guides on how to deploy rails apps on various -base operating systems. [Check Google](https://encrypted.google.com/search?hl=en&q=ruby%20on%20rails%20apache%20passenger). Of course there are also other options for the application server and reverse proxy, pick your poison. +base operating systems, [check DuckDuckGo](https://duckduckgo.com/?t=h_&q=ruby+on+rails+apache+passenger). Of course there are also other options for the application server and reverse proxy, pick your poison. ## Deploy via docker/docker-compose -There is a rudimentary docker-compose configuration for production usage (`docker-compose.yml.production-example`). It brings [OSEM up](http://0.0.0.0:8080) on port 8080. It uses persistent storage volumes for all the data users might create. You can start it with +There is a rudimentary docker-compose configuration for production usage (`docker-compose.yml.production-example`). It brings OSEM up on port 80. It uses persistent storage volumes for all the data your users might create. You can start it with 1. Configure OSEM (at least `SECRET_KEY_BASE`) ``` @@ -54,12 +54,13 @@ There is a rudimentary docker-compose configuration for production usage (`docke ``` 1. Setup the database (only once) ``` - docker-compose -f docker-compose.yml.production-example run --rm production_web bundle exec rake db:bootstrap + docker-compose -f docker-compose.yml.production-example run --rm osem bundle exec rake db:setup ``` 1. Start the services ``` docker-compose -f docker-compose.yml.production-example up ``` +1. Visit http://0.0.0.0 ## Configuration OSEM is configured through environment variables and falls back to sensible defaults. See the [dotenv.example](https://github.com/openSUSE/osem/blob/master/dotenv.example) for all possible configuration options. However here is a list of things you most likely want to configure because otherwise things will not work as expected. diff --git a/docker-compose.yml.production-example b/docker-compose.yml.production-example index 91cd051c..f3594778 100644 --- a/docker-compose.yml.production-example +++ b/docker-compose.yml.production-example @@ -1,24 +1,25 @@ services: - production_database: - image: postgres:12-alpine + postgres: + image: postgres:16-alpine environment: PGDATA: /var/lib/postgresql/data/pgdata + POSTGRES_USER: osem POSTGRES_PASSWORD: mysecretpassword volumes: - osem_production_database:/var/lib/postgresql/data/pgdata - production_web: + osem: build: context: . dockerfile: Dockerfile.production depends_on: - - production_database + - postgres ports: - - 8080:3000 + - 80:5000 env_file: .env.production # see dotenv.example file environment: - OSEM_DB_HOST: production_database - RAILS_SERVE_STATIC_FILES: 'true' - command: foreman start -p 3000 + OSEM_DB_HOST: postgres + OSEM_DB_USER: osem + OSEM_DB_PASSWORD: mysecretpassword volumes: - osem_production_web_data:/osem/public/system - osem_production_web_assets:/osem/public/assets From e98cce529444e8643048b228f8ef7f293dc016c2 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 20:16:38 +0000 Subject: [PATCH 024/118] Update net-imap to version 0.5.10 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d0550e3e..7d5c0366 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -330,7 +330,7 @@ GEM multipart-post (2.4.1) net-http (0.6.0) uri - net-imap (0.5.9) + net-imap (0.5.10) date net-protocol net-pop (0.1.2) From 19d28def75673aff51cb70c3fe2f84813450a419 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Thu, 4 Sep 2025 22:02:32 +0200 Subject: [PATCH 025/118] Adapt demo description to new setup --- README.md | 9 ++++++++- lib/tasks/data_demo.rake | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 69b58e21..edf460d6 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,10 @@ An event management tool tailored to Free and Open Source Software conferences. +## Trial + +Check out our demo at https://osem.copyleft.dev + ## Installation Please refer to our [installation guide](INSTALL.md). @@ -15,4 +19,7 @@ Please refer to our [installation guide](INSTALL.md). Please refer to our [contributing guide](CONTRIBUTING.md). ## Contact -GitHub issues are the primary way for communicating about specific proposed changes to this project. If you have other questions feel free to subscribe to the [opensuse-web@opensuse.org](http://lists.opensuse.org/opensuse-web/) mailinglist, all OSEM contributors are on that list! Additionally you can use #osem channel on [libera.chat IRC](https://libera.chat). +GitHub issues are the primary way for communicating about specific proposed changes to this project. If you have other questions feel free chat us up in the #osem channel on [libera.chat IRC](https://libera.chat). + +https://web.libera.chat/#osem + diff --git a/lib/tasks/data_demo.rake b/lib/tasks/data_demo.rake index 0e5450b4..b682fc20 100644 --- a/lib/tasks/data_demo.rake +++ b/lib/tasks/data_demo.rake @@ -6,7 +6,7 @@ namespace :data do task demo: :environment do include FactoryBot::Syntax::Methods - conference = create(:full_conference, title: 'Open Source Event Manager Demo', short_title: 'osemdemo' ,description: "This is a [Open Source Event Manager](http://osem.io/) demo instance. You can log in as **admin** with the password **password123** or just you just [sign up](/accounts/sign_up) with your own user. We hope you enjoy checking out all the functionality, if you have questions don't hesitate to [contact us](http://osem.io/#contact)!\r\n\r\n## Data will be destroyed every thirty minutes or whenever someone updates the [OSEM source code on github](https://github.com/openSUSE/osem/commits/master).") + conference = create(:full_conference, title: 'Open Source Event Manager Demo', short_title: 'osemdemo' ,description: "This is an [Open Source Event Manager](http://osem.io/) demo instance. You can log in as **admin** with the password **password123** or you [sign up](/accounts/sign_up) as a user. We hope you enjoy checking out all the functionality, if you have questions do not hesitate to contact us on [IRC](https://web.libera.chat/#osem) or file an issue on [GitHub](https://github.com/openSUSE/osem).\r\n\r\n## Data will be destroyed every thirty minutes!") conference.contact.update(email: 'osemdemo@osem.io', sponsor_email: 'osemdemo@osem.io') create(:admin, email: 'admin@osem.io', username: 'admin', password: 'password123', password_confirmation: 'password123') end From 6445e5c3409a89f532476c46e18dd2c5c34104b1 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 21:40:12 +0000 Subject: [PATCH 026/118] Update mina to version 1.2.5 --- Gemfile.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7d5c0366..fc04683a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -307,8 +307,7 @@ GEM net-smtp marcel (1.0.4) matrix (0.4.3) - mina (1.2.4) - open4 (~> 1.3.4) + mina (1.2.5) rake mini_magick (5.3.1) logger @@ -378,7 +377,6 @@ GEM omniauth-rails_csrf_protection (1.0.0) actionpack (>= 4.2) omniauth (~> 2.0) - open4 (1.3.4) orm_adapter (0.5.0) ostruct (0.6.3) paper_trail (16.0.0) From 0aa688dfd885b5a4c68649294693c484092e3306 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Fri, 5 Sep 2025 12:02:20 +0200 Subject: [PATCH 027/118] Tell people when the next demo data reset is --- lib/tasks/data_demo.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/data_demo.rake b/lib/tasks/data_demo.rake index b682fc20..b722c211 100644 --- a/lib/tasks/data_demo.rake +++ b/lib/tasks/data_demo.rake @@ -6,7 +6,7 @@ namespace :data do task demo: :environment do include FactoryBot::Syntax::Methods - conference = create(:full_conference, title: 'Open Source Event Manager Demo', short_title: 'osemdemo' ,description: "This is an [Open Source Event Manager](http://osem.io/) demo instance. You can log in as **admin** with the password **password123** or you [sign up](/accounts/sign_up) as a user. We hope you enjoy checking out all the functionality, if you have questions do not hesitate to contact us on [IRC](https://web.libera.chat/#osem) or file an issue on [GitHub](https://github.com/openSUSE/osem).\r\n\r\n## Data will be destroyed every thirty minutes!") + conference = create(:full_conference, title: 'Open Source Event Manager Demo', short_title: 'osemdemo' ,description: "This is an [Open Source Event Manager](http://osem.io/) demo instance. You can log in as **admin** with the password **password123** or you [sign up](/accounts/sign_up) as a user. We hope you enjoy checking out all the functionality, if you have questions do not hesitate to contact us on [IRC](https://web.libera.chat/#osem) or file an issue on [GitHub](https://github.com/openSUSE/osem).\r\n\r\n## Data will be destroyed every thirty minutes! (next reset: #{29.minutes.after})") conference.contact.update(email: 'osemdemo@osem.io', sponsor_email: 'osemdemo@osem.io') create(:admin, email: 'admin@osem.io', username: 'admin', password: 'password123', password_confirmation: 'password123') end From 69e00aae8e32b3f1ca368f48ff4a04f51bb34f15 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 7 Oct 2025 18:39:12 +0000 Subject: [PATCH 028/118] Update rack to version 3.1.17 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7d5c0366..fe54e4c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -423,7 +423,7 @@ GEM puma (6.6.1) nio4r (~> 2.0) racc (1.8.1) - rack (3.1.16) + rack (3.1.17) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) From 5e34a099838a721b0d635f06d3a7fb5b94a9156a Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 18:25:36 +0000 Subject: [PATCH 029/118] Update rack to version 3.1.18 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe54e4c5..d9a3628e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -423,7 +423,7 @@ GEM puma (6.6.1) nio4r (~> 2.0) racc (1.8.1) - rack (3.1.17) + rack (3.1.18) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) From 8d3808e1bba497687e88757bdbd831f6e4d3512e Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sun, 12 Oct 2025 21:31:57 -0500 Subject: [PATCH 030/118] Fix typo in edit track header --- app/views/admin/tracks/edit.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/tracks/edit.html.haml b/app/views/admin/tracks/edit.html.haml index 8d29ea44..5d9fab32 100644 --- a/app/views/admin/tracks/edit.html.haml +++ b/app/views/admin/tracks/edit.html.haml @@ -2,7 +2,7 @@ .col-md-12 .page-header %h1 - Edit Tack + Edit Track = @track.name .row .col-md-12 From fe8b4b71e461aac1407749e734667704bfaa756c Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 00:00:22 +0000 Subject: [PATCH 031/118] Update Ruby to version 3.4.7 --- .ruby-version | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index 4f5e6973..2aa51319 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.5 +3.4.7 diff --git a/Gemfile.lock b/Gemfile.lock index d9a3628e..76d279d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -766,7 +766,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 3.4.5 + ruby 3.4.7 BUNDLED WITH 2.6.9 From 7d9739349be1b688e8fd99a544b35e95b78663c1 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Wed, 15 Oct 2025 11:15:47 +0000 Subject: [PATCH 032/118] Fix various typos Fixes user-facing and non-user-facing typos Found via `codespell -S "./vendor" -L ontext,rememberable,ridiculus,varius` --- Gemfile | 2 +- app/controllers/admin/roles_controller.rb | 2 +- app/controllers/admin/sponsors_controller.rb | 2 +- app/controllers/admin/versions_controller.rb | 2 +- app/controllers/schedules_controller.rb | 2 +- app/helpers/date_time_helper.rb | 2 +- app/models/conference.rb | 12 ++++++------ app/models/event.rb | 2 +- app/models/program.rb | 2 +- app/models/ticket.rb | 2 +- app/models/user.rb | 2 +- app/views/admin/registration_periods/_form.html.haml | 2 +- app/views/booths/_form.html.haml | 2 +- app/views/schedules/_schedule.html.haml | 2 +- app/views/schedules/show.html.haml | 2 +- app/views/shared/_object_changes.html.haml | 2 +- dotenv.example | 2 +- lib/tasks/demo_data_for_development.rake | 2 +- lib/tasks/user.rake | 2 +- spec/factories/comments.rb | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Gemfile b/Gemfile index 35ba4235..53b7aaea 100644 --- a/Gemfile +++ b/Gemfile @@ -193,7 +193,7 @@ gem 'icalendar' gem 'lograge' group :development do - # for static code analisys + # for static code analysis gem 'rubocop', require: false gem 'rubocop-rspec', require: false gem 'rubocop-rails', require: false diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb index d69e1ab1..ecce2287 100644 --- a/app/controllers/admin/roles_controller.rb +++ b/app/controllers/admin/roles_controller.rb @@ -94,7 +94,7 @@ module Admin elsif user.add_role @role.name, role_resource flash[:notice] = "Successfully added role #{@role.name} to user #{user.email}" else - flash[:error] = "Coud not add role #{@role.name} to #{user.email}" + flash[:error] = "Could not add role #{@role.name} to #{user.email}" end respond_to do |format| diff --git a/app/controllers/admin/sponsors_controller.rb b/app/controllers/admin/sponsors_controller.rb index bc61d834..656154d8 100644 --- a/app/controllers/admin/sponsors_controller.rb +++ b/app/controllers/admin/sponsors_controller.rb @@ -59,7 +59,7 @@ module Admin return unless @conference.sponsorship_levels.empty? redirect_to admin_conference_sponsorship_levels_path(conference_id: @conference.short_title), - alert: 'You need to create atleast one sponsorship level to add a sponsor' + alert: 'You need to create at least one sponsorship level to add a sponsor' end end end diff --git a/app/controllers/admin/versions_controller.rb b/app/controllers/admin/versions_controller.rb index 751ac746..d5b5defd 100644 --- a/app/controllers/admin/versions_controller.rb +++ b/app/controllers/admin/versions_controller.rb @@ -45,7 +45,7 @@ module Admin end elsif @version.event == 'create' && @version.item - # if @version represets a create event and is not currently deleted + # if @version represents a create event and is not currently deleted @version.item.destroy flash[:notice] = 'The selected change was successfully reverted' diff --git a/app/controllers/schedules_controller.rb b/app/controllers/schedules_controller.rb index 5f68c27c..fd03abc6 100644 --- a/app/controllers/schedules_controller.rb +++ b/app/controllers/schedules_controller.rb @@ -39,7 +39,7 @@ class SchedulesController < ApplicationController @current_day = @conference.current_conference_day @day = @current_day.present? ? @current_day : @dates.first if @current_day - # the schedule takes you to the current time if it is beetween the start and the end time. + # the schedule takes you to the current time if it is between the start and the end time. @hour_column = @conference.hours_from_start_time(@conf_start, @conference.end_hour) end # Ids of the @event_schedules of confrmed self_organized tracks along with the selected_schedule_id diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb index 420b086a..71681b2f 100644 --- a/app/helpers/date_time_helper.rb +++ b/app/helpers/date_time_helper.rb @@ -17,7 +17,7 @@ module DateTimeHelper ## # Gets a datetime object # ====Returns - # * +String+ -> formated datetime object + # * +String+ -> formatted datetime object def format_datetime(obj) return unless obj diff --git a/app/models/conference.rb b/app/models/conference.rb index 6efd70b0..f8f8361a 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -422,7 +422,7 @@ class Conference < ApplicationRecord ## # Returns a hash with affiliation => - # {value: count of registration whose user has that affilation, color: color} + # {value: count of registration whose user has that affiliation, color: color} # In case that the affiliation is blank, it groups them in None and # if the number of persons that have an affiliation are less than the 2% of # the total number of registered people, they are grouped in others. @@ -696,7 +696,7 @@ class Conference < ApplicationRecord end # Returns the number of hours since the conference start hour (9) to the - # current hour, in case that the current hour is beetween the start and the + # current hour, in case that the current hour is between the start and the # end hour (20). Otherwise, returns 0 def hours_from_start_time(start_hour, end_hour) current_time = Time.find_zone(timezone).now @@ -744,7 +744,7 @@ class Conference < ApplicationRecord '#' + next_color_component(:r, i) + next_color_component(:g, i) + next_color_component(:b, i) end - # Auxiliar function which is used in next_color and returns each component of + # Auxiliary function which is used in next_color and returns each component of # the color. We make use of big prime numbers to avoid repetition and to make # consecutive colors clearly different. def next_color_component(component, i) @@ -787,7 +787,7 @@ class Conference < ApplicationRecord ## # Checks if start hour of the conference is greater or equal than the end hour - # and that both hours are beetween 0 and 24 + # and that both hours are between 0 and 24 # # Reports an error when such a condition is found def valid_times_range? @@ -922,7 +922,7 @@ class Conference < ApplicationRecord # # ====Returns # * +True+ -> One difficulty level or more - # * +False+ -> No diffculty level + # * +False+ -> No difficulty level def difficulty_levels_set? program.difficulty_levels.any? end @@ -932,7 +932,7 @@ class Conference < ApplicationRecord # # ====Returns # * +True+ -> One difficulty level or more - # * +False+ -> No diffculty level + # * +False+ -> No difficulty level def event_types_set? program.event_types.any? end diff --git a/app/models/event.rb b/app/models/event.rb index 82f8204b..c8872429 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -94,7 +94,7 @@ class Event < ApplicationRecord }.freeze ## - # Checkes if the event has a start_time and a room for the selected schedule if there is any + # Checks if the event has a start_time and a room for the selected schedule if there is any # ====Returns # * +true+ or +false+ def scheduled? diff --git a/app/models/program.rb b/app/models/program.rb index f367d1b2..d90f5961 100644 --- a/app/models/program.rb +++ b/app/models/program.rb @@ -133,7 +133,7 @@ class Program < ApplicationRecord end ## - # Checcks if the program has rating enabled + # Checks if the program has rating enabled # # ====Returns # * +false+ -> If rating is not enabled diff --git a/app/models/ticket.rb b/app/models/ticket.rb index abc014cd..fc80f56b 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -13,7 +13,7 @@ class Ticket < ApplicationRecord scope :for_registration, -> { where(registration_ticket: true) } # This validation is for the sake of simplicity. - # If we would allow different currencies per conference we also have to handle convertions between currencies! + # If we would allow different currencies per conference we also have to handle conversions between currencies! validate :tickets_of_conference_have_same_currency validates :price_cents, :price_currency, :title, presence: true diff --git a/app/models/user.rb b/app/models/user.rb index 4cbac281..aca92cf9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -111,7 +111,7 @@ class User < ApplicationRecord }.freeze ## - # Checkes if the user attended the event + # Checks if the user attended the event # This is used for events that require registration # The user must have registered to attend the event # Gets an event diff --git a/app/views/admin/registration_periods/_form.html.haml b/app/views/admin/registration_periods/_form.html.haml index 2bf25a57..ec274139 100644 --- a/app/views/admin/registration_periods/_form.html.haml +++ b/app/views/admin/registration_periods/_form.html.haml @@ -1,5 +1,5 @@ %p - Setup the time frame in which people can registrer to your conference + Setup the time frame in which people can register to your conference = form_for(@registration_period, url: admin_conference_registration_period_path(@conference.short_title)) do |f| .form-group = f.label :start_date diff --git a/app/views/booths/_form.html.haml b/app/views/booths/_form.html.haml index 7796149d..9e10d740 100644 --- a/app/views/booths/_form.html.haml +++ b/app/views/booths/_form.html.haml @@ -18,7 +18,7 @@ %abbr{title: 'This field is required'} * = f.text_field :submitter_relationship, rows: 5, required: true, class: 'form-control' %span.help-block - e.g. employee, comunity manager, etc + e.g. employee, community manager, etc .form-group = f.label :website_url, 'Website URL' %abbr{title: 'This field is required'} * diff --git a/app/views/schedules/_schedule.html.haml b/app/views/schedules/_schedule.html.haml index 3b4c3dac..4ec0acd1 100644 --- a/app/views/schedules/_schedule.html.haml +++ b/app/views/schedules/_schedule.html.haml @@ -42,7 +42,7 @@ } }); - // hide the right and left controls when neccesary after moving the carousel + // hide the right and left controls when necessary after moving the carousel $('.carousel').on('slid.bs.carousel', '', function(){ $(this).children('.left.carousel-control').show(); diff --git a/app/views/schedules/show.html.haml b/app/views/schedules/show.html.haml index 8000b1ad..7716b63c 100644 --- a/app/views/schedules/show.html.haml +++ b/app/views/schedules/show.html.haml @@ -43,7 +43,7 @@ }); }); - // hide the right and left controls when neccesary after moving the carousel + // hide the right and left controls when necessary after moving the carousel $('.carousel').on('slid.bs.carousel', '', function(){ $(this).children('.left.carousel-control').show(); diff --git a/app/views/shared/_object_changes.html.haml b/app/views/shared/_object_changes.html.haml index 47a3e701..3069149f 100644 --- a/app/views/shared/_object_changes.html.haml +++ b/app/views/shared/_object_changes.html.haml @@ -12,7 +12,7 @@ %th Updated Attribute %th{ class: "#{'hidden' if version.event == 'create'}" } - Prevous Value + Previous Value %th{ class: "#{'hidden' if version.event == 'destroy'}" } New Value diff --git a/dotenv.example b/dotenv.example index 6d31d9c6..c402f156 100644 --- a/dotenv.example +++ b/dotenv.example @@ -12,7 +12,7 @@ # The name of the host the database runs on # OSEM_DB_HOST=database -# The port the databse runs on +# The port the database runs on # OSEM_DB_PORT=3306 # The user to access the database with diff --git a/lib/tasks/demo_data_for_development.rake b/lib/tasks/demo_data_for_development.rake index 7a40d19f..5b0ddc09 100644 --- a/lib/tasks/demo_data_for_development.rake +++ b/lib/tasks/demo_data_for_development.rake @@ -7,7 +7,7 @@ namespace :data do task surveys: :environment do conference = create(:full_conference, start_date: Date.current, end_date: Date.current + 1.day) survey_after_conference_active = create(:survey, surveyable: conference, target: :after_conference, title: 'Survey about the conference', start_date: conference.start_date - 1.day, end_date: conference.end_date + 5.days, description: 'Survey about the conference. You can already see it.') - # survey_after_conference_inactive = create(:survey, surveyable: conference, target: :after_conference, title: 'Survey about the conference', start_date: conference.start_date + 1.day, end_date: conference.end_date + 5.days, description: 'Survey abou the conference. Not available yet!') + # survey_after_conference_inactive = create(:survey, surveyable: conference, target: :after_conference, title: 'Survey about the conference', start_date: conference.start_date + 1.day, end_date: conference.end_date + 5.days, description: 'Survey about the conference. Not available yet!') # survey_on_registration = create(:survey, surveyable: conference, target: :during_registration, title: 'Survey during registation', start_date: conference.registration_period.start_date, end_date: conference.registration_period.end_date, description: 'Survey during registration.') create(:boolean_non_mandatory, survey: survey_after_conference_active) diff --git a/lib/tasks/user.rake b/lib/tasks/user.rake index fb4688ac..ae262687 100644 --- a/lib/tasks/user.rake +++ b/lib/tasks/user.rake @@ -16,7 +16,7 @@ namespace :user do end end - desc "Set email_public attrubute true for all users" + desc "Set email_public attribute true for all users" task :set_email_public => :environment do User.update_all email_public: true end diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb index d30dca9b..6b424d26 100644 --- a/spec/factories/comments.rb +++ b/spec/factories/comments.rb @@ -4,7 +4,7 @@ FactoryBot.define do factory :comment do - body { 'Most interresting comment ever, created by a girl.' } + body { 'Most interesting comment ever, created by a girl.' } user association :commentable, factory: :event end From 2083fde297c2f46d1460873a2b9d33aee3008936 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 31 Oct 2025 21:45:14 +0000 Subject: [PATCH 033/118] Update factory_bot to version 6.5.6 --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d9a3628e..33bde0fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,8 +98,8 @@ GEM activerecord (>= 4.0.0, < 8.1) base64 (0.3.0) bcrypt (3.1.20) - benchmark (0.4.1) - bigdecimal (3.2.2) + benchmark (0.5.0) + bigdecimal (3.3.1) bindex (0.8.1) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) @@ -151,7 +151,7 @@ GEM ostruct cocoon (1.2.15) concurrent-ruby (1.3.5) - connection_pool (2.5.3) + connection_pool (2.5.4) countable-rails (0.0.1) railties (>= 3.1) crack (0.4.5) @@ -191,7 +191,7 @@ GEM erb (5.0.2) erubi (1.13.1) execjs (2.8.1) - factory_bot (6.5.4) + factory_bot (6.5.6) activesupport (>= 6.1.0) factory_bot_rails (6.5.0) factory_bot (~> 6.5) @@ -314,7 +314,7 @@ GEM logger mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (5.25.5) + minitest (5.26.0) monetize (1.9.4) money (~> 6.12) money (6.13.8) From e703d1dcf46ccb3420ffd65d17aa4ea40abf66f6 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Wed, 5 Nov 2025 16:17:49 -0600 Subject: [PATCH 034/118] Fix typo in venue form help text --- app/views/admin/venues/_form.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/venues/_form.html.haml b/app/views/admin/venues/_form.html.haml index 960b01e4..39f14aa0 100644 --- a/app/views/admin/venues/_form.html.haml +++ b/app/views/admin/venues/_form.html.haml @@ -33,7 +33,7 @@ = f.file_field :picture = f.hidden_field :picture_cache %span.help-block - This will be displayed on the venue are of the splash page. + This will be displayed on the venue area of the splash page. .form-group = f.label :street %abbr{title: 'This field is required'} * From 0f7f610abad6cf8301328154034b6f39c522fd9f Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 25 Dec 2025 00:00:21 +0000 Subject: [PATCH 035/118] Update Ruby to version 3.4.8 --- .ruby-version | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index 2aa51319..7921bd0c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.7 +3.4.8 diff --git a/Gemfile.lock b/Gemfile.lock index 76d279d8..3caa72e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -766,7 +766,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 3.4.7 + ruby 3.4.8 BUNDLED WITH 2.6.9 From 4fc8726c41204774182d95265d90659f9bc58019 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 30 Dec 2025 22:15:11 +0000 Subject: [PATCH 036/118] Update uri to version 1.1.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 76d279d8..fafb83e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -633,7 +633,7 @@ GEM unicode-emoji (4.0.4) unobtrusive_flash (3.3.1) railties - uri (1.0.3) + uri (1.1.1) useragent (0.16.11) version_gem (1.1.8) warden (1.2.9) From 8fd68a525f78474217db563912942d2b27577d84 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:45:22 +0000 Subject: [PATCH 037/118] Update pg to version 1.6.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 76d279d8..cc66fd0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -397,7 +397,7 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.6.1) + pg (1.6.3) pp (0.6.2) prettyprint prawn (2.5.0) From e13485d14e12951d06b370bca05f10a452ab4ad0 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 7 Jan 2026 12:45:11 +0000 Subject: [PATCH 038/118] Update version_gem to version 1.1.9 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f935daf1..f87953dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -635,7 +635,7 @@ GEM railties uri (1.1.1) useragent (0.16.11) - version_gem (1.1.8) + version_gem (1.1.9) warden (1.2.9) rack (>= 2.0.9) web-console (4.1.0) From ae30f6ec237cdb96c17e3fc2f184902e697c4519 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 4 Feb 2026 22:45:14 +0000 Subject: [PATCH 039/118] Update rspec-support to version 3.13.7 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f935daf1..3c67b806 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -515,7 +515,7 @@ GEM rspec-expectations (~> 3.13) rspec-mocks (~> 3.13) rspec-support (~> 3.13) - rspec-support (3.13.4) + rspec-support (3.13.7) rubocop (1.79.2) json (~> 2.3) language_server-protocol (~> 3.17.0.2) From f3f2887ba89e762e436e635da341fde63dd4decc Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 5 Feb 2026 11:10:13 +0000 Subject: [PATCH 040/118] Update rexml to version 3.4.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 786edadf..b7c42627 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -487,7 +487,7 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.4.2) + rexml (3.4.4) rolify (6.0.0) rqrcode (3.1.0) chunky_png (~> 1.0) From 00787f45df65473823bb56a2f1462e701be6ea5d Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 5 Feb 2026 11:15:13 +0000 Subject: [PATCH 041/118] Update regexp_parser to version 2.11.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 786edadf..f78e429c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -479,7 +479,7 @@ GEM psych (>= 4.0.0) recaptcha (5.20.1) redcarpet (3.6.1) - regexp_parser (2.11.2) + regexp_parser (2.11.3) reline (0.6.2) io-console (~> 0.5) request_store (1.7.0) From b0c53a8e9d6be9c81df6f4bceb7d3a76918ec6e3 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 5 Feb 2026 11:20:12 +0000 Subject: [PATCH 042/118] Update omniauth to version 2.1.4 --- Gemfile.lock | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 786edadf..2e54d01e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -235,7 +235,8 @@ GEM sysexits (~> 1.1) hashdiff (1.0.1) hashery (2.1.2) - hashie (5.0.0) + hashie (5.1.0) + logger htmlentities (4.3.4) i18n (1.14.7) concurrent-ruby (~> 1.0) @@ -352,8 +353,9 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0, >= 2.0.3) version_gem (>= 1.1.8, < 3) - omniauth (2.1.3) + omniauth (2.1.4) hashie (>= 3.4.6) + logger rack (>= 2.2.3) rack-protection omniauth-facebook (8.0.0) @@ -421,11 +423,11 @@ GEM puma (6.6.1) nio4r (~> 2.0) racc (1.8.1) - rack (3.1.18) + rack (3.1.19) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-protection (4.1.1) + rack-protection (4.2.1) base64 (>= 0.1.0) logger (>= 1.6.0) rack (>= 3.0.0, < 4) From e7335430e72fe61d998bb7a3c4353f6c7be76e4c Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 5 Feb 2026 13:40:15 +0000 Subject: [PATCH 043/118] Update chartkick to version 5.2.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 237eeb49..11cdb479 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -138,7 +138,7 @@ GEM caxlsx_rails (0.6.2) actionpack (>= 3.1) caxlsx (>= 3.0) - chartkick (5.2.0) + chartkick (5.2.1) childprocess (5.1.0) logger (~> 1.5) chronic (0.10.2) From 743834af830fb0221bb267e2044bc3d709bc875e Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 5 Feb 2026 13:45:12 +0000 Subject: [PATCH 044/118] Update rspec-core to version 3.13.6 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 237eeb49..c01b7275 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -499,7 +499,7 @@ GEM activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.13.5) + rspec-core (3.13.6) rspec-support (~> 3.13.0) rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) From 13601bf818ee18a5480dd9aae27e95bbc4c18267 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 5 Feb 2026 14:05:58 +0000 Subject: [PATCH 045/118] Update factory_bot_rails to version 6.5.1 --- Gemfile.lock | 160 +++++++++++++++++++++++++++------------------------ 1 file changed, 84 insertions(+), 76 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 11cdb479..0ece51f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,47 +2,49 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (2.0.1) - actioncable (7.2.2.1) - actionpack (= 7.2.2.1) - activesupport (= 7.2.2.1) + actioncable (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - 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) + actionmailbox (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) mail (>= 2.8.0) - 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) + actionmailer (7.2.3) + actionpack (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activesupport (= 7.2.3) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.2.2.1) - actionview (= 7.2.2.1) - activesupport (= 7.2.2.1) + actionpack (7.2.3) + actionview (= 7.2.3) + activesupport (= 7.2.3) + cgi nokogiri (>= 1.8.5) racc - rack (>= 2.2.4, < 3.2) + rack (>= 2.2.4, < 3.3) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - 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) + actiontext (7.2.3) + actionpack (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.2.2.1) - activesupport (= 7.2.2.1) + actionview (7.2.3) + activesupport (= 7.2.3) builder (~> 3.1) + cgi erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) @@ -51,22 +53,22 @@ GEM activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (7.2.2.1) - activesupport (= 7.2.2.1) + activejob (7.2.3) + activesupport (= 7.2.3) globalid (>= 0.3.6) - 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) + activemodel (7.2.3) + activesupport (= 7.2.3) + activerecord (7.2.3) + activemodel (= 7.2.3) + activesupport (= 7.2.3) timeout (>= 0.4.0) - 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) + activestorage (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activesupport (= 7.2.3) marcel (~> 1.0) - activesupport (7.2.2.1) + activesupport (7.2.3) base64 benchmark (>= 0.3) bigdecimal @@ -138,6 +140,7 @@ GEM caxlsx_rails (0.6.2) actionpack (>= 3.1) caxlsx (>= 3.0) + cgi (0.5.1) chartkick (5.2.1) childprocess (5.1.0) logger (~> 1.5) @@ -150,8 +153,8 @@ GEM faraday-multipart (~> 1.0, >= 1.0.4) ostruct cocoon (1.2.15) - concurrent-ruby (1.3.5) - connection_pool (2.5.4) + concurrent-ruby (1.3.6) + connection_pool (3.0.2) countable-rails (0.0.1) railties (>= 3.1) crack (0.4.5) @@ -167,7 +170,7 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0) database_cleaner-core (2.0.1) - date (3.4.1) + date (3.5.1) delayed_job (4.1.13) activesupport (>= 3.0, < 9.0) delayed_job_active_record (4.1.11) @@ -188,12 +191,12 @@ GEM dotenv (= 3.1.8) railties (>= 6.1) drb (2.2.3) - erb (5.0.2) + erb (6.0.1) erubi (1.13.1) execjs (2.8.1) factory_bot (6.5.6) activesupport (>= 6.1.0) - factory_bot_rails (6.5.0) + factory_bot_rails (6.5.1) factory_bot (~> 6.5) railties (>= 6.1.0) faker (3.5.2) @@ -238,7 +241,7 @@ GEM hashie (5.1.0) logger htmlentities (4.3.4) - i18n (1.14.7) + i18n (1.14.8) concurrent-ruby (~> 1.0) i18n_data (0.13.0) icalendar (2.11.2) @@ -250,9 +253,9 @@ GEM image_processing (1.14.0) mini_magick (>= 4.9.5, < 6) ruby-vips (>= 2.0.17, < 3) - io-console (0.8.1) + io-console (0.8.2) io-like (0.4.0) - irb (1.15.2) + irb (1.16.0) pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) @@ -298,7 +301,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.24.1) + loofah (2.25.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -314,7 +317,8 @@ GEM logger mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (5.26.0) + minitest (6.0.1) + prism (~> 1.5) monetize (1.9.4) money (~> 6.12) money (6.13.8) @@ -342,7 +346,7 @@ GEM next_rails (1.4.6) rainbow (>= 3) nio4r (2.7.4) - nokogiri (1.18.9) + nokogiri (1.19.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth2 (2.0.12) @@ -398,7 +402,7 @@ GEM ruby-rc4 ttfunk pg (1.6.3) - pp (0.6.2) + pp (0.6.3) prettyprint prawn (2.5.0) matrix (~> 0.4) @@ -415,15 +419,15 @@ GEM prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) prettyprint (0.2.0) - prism (1.4.0) - psych (5.2.6) + prism (1.9.0) + psych (5.3.1) date stringio public_suffix (6.0.2) puma (6.6.1) nio4r (~> 2.0) racc (1.8.1) - rack (3.1.19) + rack (3.2.4) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -436,22 +440,22 @@ GEM rack (>= 3.0.0) rack-test (2.2.0) rack (>= 1.3) - rackup (2.2.1) + rackup (2.3.1) rack (>= 3) - 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) + rails (7.2.3) + actioncable (= 7.2.3) + actionmailbox (= 7.2.3) + actionmailer (= 7.2.3) + actionpack (= 7.2.3) + actiontext (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activemodel (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) bundler (>= 1.15.0) - railties (= 7.2.2.1) + railties (= 7.2.3) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -466,23 +470,26 @@ GEM rails-i18n (7.0.1) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.2.2.1) - actionpack (= 7.2.2.1) - activesupport (= 7.2.2.1) + railties (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) + cgi irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.3.0) - rdoc (6.14.2) + rake (13.3.1) + rdoc (7.1.0) erb psych (>= 4.0.0) + tsort recaptcha (5.20.1) redcarpet (3.6.1) regexp_parser (2.11.3) - reline (0.6.2) + reline (0.6.3) io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) @@ -606,7 +613,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) ssrf_filter (1.3.0) - stringio (3.1.7) + stringio (3.2.0) stripe (5.43.0) stripe-ruby-mock (3.1.0.rc3) dante (>= 0.2.0) @@ -614,11 +621,12 @@ GEM stripe (> 5, < 6) sysexits (1.2.0) temple (0.10.4) - thor (1.4.0) + thor (1.5.0) tilt (2.6.1) timecop (0.9.4) timeout (0.4.3) transitions (1.2.1) + tsort (0.2.0) ttfunk (1.8.0) bigdecimal (~> 3.1) turbolinks (5.2.1) @@ -660,7 +668,7 @@ GEM chronic (>= 0.6.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.7.3) + zeitwerk (2.7.4) PLATFORMS ruby From 5a7a5c21dd583c563eca3f044944031b9bc617ff Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 5 Feb 2026 14:55:12 +0000 Subject: [PATCH 046/118] Update nio4r to version 2.7.5 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0ece51f7..31b3bbf7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -345,7 +345,7 @@ GEM net-protocol next_rails (1.4.6) rainbow (>= 3) - nio4r (2.7.4) + nio4r (2.7.5) nokogiri (1.19.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) From ff391e296aebe17b43176d278f47183eb97c7005 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 5 Feb 2026 15:05:13 +0000 Subject: [PATCH 047/118] Update rspec-mocks to version 3.13.7 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0ece51f7..b7e448fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -511,7 +511,7 @@ GEM rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.5) + rspec-mocks (3.13.7) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-rails (8.0.2) From f564fc6d65f498e796871c22232c01a54d36eba4 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Mon, 9 Feb 2026 22:20:12 +0000 Subject: [PATCH 048/118] Update faraday to version 2.14.0 --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0ece51f7..5e00d950 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,7 +201,7 @@ GEM railties (>= 6.1.0) faker (3.5.2) i18n (>= 1.8.11, < 2) - faraday (2.13.4) + faraday (2.14.0) faraday-net_http (>= 2.0, < 3.5) json logger @@ -209,8 +209,8 @@ GEM faraday (>= 1, < 3) faraday-multipart (1.1.1) multipart-post (~> 2.0) - faraday-net_http (3.4.1) - net-http (>= 0.5.0) + faraday-net_http (3.4.2) + net-http (~> 0.5) fastimage (2.4.0) feature (1.4.0) ffi (1.17.2) @@ -272,7 +272,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.13.2) + json (2.18.1) json-schema (6.0.0) addressable (~> 2.8) bigdecimal (~> 3.1) @@ -332,8 +332,8 @@ GEM multi_xml (0.7.2) bigdecimal (~> 3.1) multipart-post (2.4.1) - net-http (0.6.0) - uri + net-http (0.9.1) + uri (>= 0.11.1) net-imap (0.5.10) date net-protocol From 5b04b8892d9b80c3a958a9ae3b450b0ebc9ea348 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 11:40:14 +0000 Subject: [PATCH 049/118] Update oauth2 to version 2.0.18 --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e9eb8662..3d852e43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,7 +201,7 @@ GEM railties (>= 6.1.0) faker (3.5.2) i18n (>= 1.8.11, < 2) - faraday (2.14.0) + faraday (2.14.1) faraday-net_http (>= 2.0, < 3.5) json logger @@ -329,8 +329,8 @@ GEM money (~> 6.13.2) railties (>= 3.0) multi_json (1.17.0) - multi_xml (0.7.2) - bigdecimal (~> 3.1) + multi_xml (0.8.1) + bigdecimal (>= 3.1, < 5) multipart-post (2.4.1) net-http (0.9.1) uri (>= 0.11.1) @@ -349,14 +349,14 @@ GEM nokogiri (1.19.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oauth2 (2.0.12) + oauth2 (2.0.18) faraday (>= 0.17.3, < 4.0) jwt (>= 1.0, < 4.0) logger (~> 1.2) multi_xml (~> 0.5) rack (>= 1.2, < 4) snaky_hash (~> 2.0, >= 2.0.3) - version_gem (>= 1.1.8, < 3) + version_gem (~> 1.1, >= 1.1.9) omniauth (2.1.4) hashie (>= 3.4.6) logger From 17b7330e2831d1ead5cb833db7cfcaf9a9f0b8af Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 11:45:12 +0000 Subject: [PATCH 050/118] Update addressable to version 2.8.8 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e9eb8662..9c8c9fc6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,8 +86,8 @@ GEM awesome_nested_set (>= 2.0) acts_as_list (1.0.4) activerecord (>= 4.2) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.8) + public_suffix (>= 2.0.2, < 8.0) afm (1.0.0) ajax-datatables-rails (1.3.1) zeitwerk @@ -423,7 +423,7 @@ GEM psych (5.3.1) date stringio - public_suffix (6.0.2) + public_suffix (7.0.2) puma (6.6.1) nio4r (~> 2.0) racc (1.8.1) From 08fcfee6e9817992bf4142299f13b4f69fd07efd Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 12:15:11 +0000 Subject: [PATCH 051/118] Update pdf-reader to version 2.15.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe02cf70..74e0b201 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -395,7 +395,7 @@ GEM pdf-core (0.10.0) pdf-inspector (1.3.0) pdf-reader (>= 1.0, < 3.0.a) - pdf-reader (2.15.0) + pdf-reader (2.15.1) Ascii85 (>= 1.0, < 3.0, != 2.0.0) afm (>= 0.2.1, < 2) hashery (~> 2.0) From bb0181f651df8119e0d0d67e549f9610e6a6853e Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 12:20:12 +0000 Subject: [PATCH 052/118] Update ffi to version 1.17.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe02cf70..2341fa1f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,7 +213,7 @@ GEM net-http (~> 0.5) fastimage (2.4.0) feature (1.4.0) - ffi (1.17.2) + ffi (1.17.3) font-awesome-sass (6.7.2) sassc (~> 2.0) geckodriver-helper (0.24.0) From c380cdf97e4299fd353f0709ad746e7da72ca7af Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 12:25:12 +0000 Subject: [PATCH 053/118] Update bcrypt to version 3.1.21 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe02cf70..f776228e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM awesome_nested_set (3.8.0) activerecord (>= 4.0.0, < 8.1) base64 (0.3.0) - bcrypt (3.1.20) + bcrypt (3.1.21) benchmark (0.5.0) bigdecimal (3.3.1) bindex (0.8.1) From 81e0c4254e9db8597dc84466b13d6340f262c439 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 12:30:12 +0000 Subject: [PATCH 054/118] Update parser to version 3.3.10.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fe02cf70..83efdcf2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -389,7 +389,7 @@ GEM activerecord (>= 6.1) request_store (~> 1.4) parallel (1.27.0) - parser (3.3.9.0) + parser (3.3.10.1) ast (~> 2.4.1) racc pdf-core (0.10.0) From db7fdc4964e0d890a7ba87fa340e9c6e6cf94609 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 17:30:13 +0000 Subject: [PATCH 055/118] Update hashdiff to version 1.2.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c0047176..b44c528a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -236,7 +236,7 @@ GEM rainbow rubocop (>= 1.0) sysexits (~> 1.1) - hashdiff (1.0.1) + hashdiff (1.2.1) hashery (2.1.2) hashie (5.1.0) logger From 6e84eca20af4fbc9d8fa6aa220d378a4ba4d2788 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 17:35:13 +0000 Subject: [PATCH 056/118] Update unicode-display_width to version 3.2.0 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c0047176..558e4a9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -636,9 +636,9 @@ GEM concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (3.1.5) - unicode-emoji (~> 4.0, >= 4.0.4) - unicode-emoji (4.0.4) + unicode-display_width (3.2.0) + unicode-emoji (~> 4.1) + unicode-emoji (4.2.0) unobtrusive_flash (3.3.1) railties uri (1.1.1) From ba53909d3ad4956e641a8ab44da31cfaf01162c7 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 17:40:16 +0000 Subject: [PATCH 057/118] Update recaptcha to version 5.21.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c0047176..a5049e65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -486,7 +486,7 @@ GEM erb psych (>= 4.0.0) tsort - recaptcha (5.20.1) + recaptcha (5.21.1) redcarpet (3.6.1) regexp_parser (2.11.3) reline (0.6.3) From 2f575a52fc83603545d8d06132a7270a1cb95a9a Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 17 Feb 2026 18:15:30 +0000 Subject: [PATCH 058/118] Update rack to version 3.2.5 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c0047176..bbbeb391 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -427,7 +427,7 @@ GEM puma (6.6.1) nio4r (~> 2.0) racc (1.8.1) - rack (3.2.4) + rack (3.2.5) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) From a7a022e68ec586390feeccdf2b5cc4ace71ef21d Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 19 Feb 2026 00:30:23 +0000 Subject: [PATCH 059/118] Update nokogiri to version 1.19.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c0047176..85dcd51a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -346,7 +346,7 @@ GEM next_rails (1.4.6) rainbow (>= 3) nio4r (2.7.5) - nokogiri (1.19.0) + nokogiri (1.19.1) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth2 (2.0.18) From 23d2ee5ced16a567ceab3843381f1236613210d4 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 19 Feb 2026 16:55:11 +0000 Subject: [PATCH 060/118] Update globalid to version 1.3.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 28ee3ea1..b32dc4fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -218,7 +218,7 @@ GEM sassc (~> 2.0) geckodriver-helper (0.24.0) archive-zip (~> 0.7) - globalid (1.2.1) + globalid (1.3.0) activesupport (>= 6.1) gravtastic (3.2.6) haml (6.3.0) From 8943807c0413c8c76ee512365b08579a1a148f70 Mon Sep 17 00:00:00 2001 From: gunapriya07 Date: Mon, 2 Mar 2026 13:09:08 +0530 Subject: [PATCH 061/118] Fix: allow all users to view conference code of conduct (#3708) --- app/models/ability.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/ability.rb b/app/models/ability.rb index 913c97ff..08ef50a9 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -21,6 +21,7 @@ class Ability can [:show], Conference do |conference| conference.splashpage&.public == true end + can :code_of_conduct, Conference # Can view the schedule can [:schedule, :events], Conference do |conference| conference.program.cfp && conference.program.schedule_public From f52b58ec4004234c38f442ea951bdf47dd8397b6 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 3 Mar 2026 16:17:32 +0100 Subject: [PATCH 062/118] Update delayed_job to 4.2.0 --- Gemfile.lock | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 74ba72fc..d3105767 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,8 +171,10 @@ GEM database_cleaner-core (~> 2.0) database_cleaner-core (2.0.1) date (3.5.1) - delayed_job (4.1.13) + delayed_job (4.2.0) activesupport (>= 3.0, < 9.0) + benchmark + logger delayed_job_active_record (4.1.11) activerecord (>= 3.0, < 9.0) delayed_job (>= 3.0, < 5) @@ -317,7 +319,8 @@ GEM logger mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (6.0.1) + minitest (6.0.2) + drb (~> 2.0) prism (~> 1.5) monetize (1.9.4) money (~> 6.12) From c9e927d4fad84da41d766fa0c453dd566bc5912f Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 3 Mar 2026 16:34:52 +0100 Subject: [PATCH 063/118] Pin connection_pool to <3 To work around https://github.com/mperham/connection_pool/issues/212 --- Gemfile | 2 ++ Gemfile.lock | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 53b7aaea..9458f1be 100644 --- a/Gemfile +++ b/Gemfile @@ -183,6 +183,8 @@ gem 'sprockets-rails' # for multiple speakers select on proposal/event forms gem 'selectize-rails' +# Pin to solve https://github.com/mperham/connection_pool/issues/212 +gem "connection_pool", "< 3" # memcached binary connector gem 'dalli' diff --git a/Gemfile.lock b/Gemfile.lock index d3105767..a9f950fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,7 +154,7 @@ GEM ostruct cocoon (1.2.15) concurrent-ruby (1.3.6) - connection_pool (3.0.2) + connection_pool (2.5.5) countable-rails (0.0.1) railties (>= 3.1) crack (0.4.5) @@ -695,6 +695,7 @@ DEPENDENCIES climate_control cloudinary cocoon + connection_pool (< 3) countable-rails daemons dalli From cf87cc628094da92cca710e42bb0c3020bc3eec0 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 17 Mar 2026 15:53:45 +0100 Subject: [PATCH 064/118] Remove unused ticket_purchase_params --- app/controllers/ticket_purchases_controller.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/controllers/ticket_purchases_controller.rb b/app/controllers/ticket_purchases_controller.rb index 632a7289..b5e957cf 100644 --- a/app/controllers/ticket_purchases_controller.rb +++ b/app/controllers/ticket_purchases_controller.rb @@ -31,10 +31,4 @@ class TicketPurchasesController < ApplicationController def index @unpaid_ticket_purchases = current_user.ticket_purchases.by_conference(@conference).unpaid end - - private - - def ticket_purchase_params - params.require(:ticket_purchase).permit(:ticket_id, :user_id, :conference_id, :quantity) - end end From d69255dbbd046fbebcfb4f49f1d134ec89cab75b Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 18:05:44 +0000 Subject: [PATCH 065/118] Update devise to version 5.0.3 --- Gemfile.lock | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a9f950fa..7d7bf57e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,10 +178,10 @@ GEM delayed_job_active_record (4.1.11) activerecord (>= 3.0, < 9.0) delayed_job (>= 3.0, < 5) - devise (4.9.4) + devise (5.0.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0) + railties (>= 7.0) responders warden (~> 1.2.3) devise_ichain_authenticatable (0.3.2) @@ -193,7 +193,7 @@ GEM dotenv (= 3.1.8) railties (>= 6.1) drb (2.2.3) - erb (6.0.1) + erb (6.0.2) erubi (1.13.1) execjs (2.8.1) factory_bot (6.5.6) @@ -257,8 +257,9 @@ GEM ruby-vips (>= 2.0.17, < 3) io-console (0.8.2) io-like (0.4.0) - irb (1.16.0) + irb (1.17.0) pp (>= 0.6.0) + prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) iso-639 (0.3.8) @@ -303,7 +304,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.25.0) + loofah (2.25.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -467,8 +468,8 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.2) - loofah (~> 2.21) + rails-html-sanitizer (1.7.0) + loofah (~> 2.25) 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) rails-i18n (7.0.1) i18n (>= 0.7, < 2) @@ -485,7 +486,7 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.3.1) - rdoc (7.1.0) + rdoc (7.2.0) erb psych (>= 4.0.0) tsort @@ -496,9 +497,9 @@ GEM io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) - responders (3.1.1) - actionpack (>= 5.2) - railties (>= 5.2) + responders (3.2.0) + actionpack (>= 7.0) + railties (>= 7.0) rexml (3.4.4) rolify (6.0.0) rqrcode (3.1.0) @@ -671,7 +672,7 @@ GEM chronic (>= 0.6.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.7.4) + zeitwerk (2.7.5) PLATFORMS ruby From bb3868f351efdb1f708c35d3c28bb873ff251ad5 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2026 09:45:15 +0000 Subject: [PATCH 066/118] Update rspec-rails to version 8.0.4 --- Gemfile.lock | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a9f950fa..e1321483 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,7 +193,7 @@ GEM dotenv (= 3.1.8) railties (>= 6.1) drb (2.2.3) - erb (6.0.1) + erb (6.0.2) erubi (1.13.1) execjs (2.8.1) factory_bot (6.5.6) @@ -257,8 +257,9 @@ GEM ruby-vips (>= 2.0.17, < 3) io-console (0.8.2) io-like (0.4.0) - irb (1.16.0) + irb (1.17.0) pp (>= 0.6.0) + prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) iso-639 (0.3.8) @@ -303,7 +304,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.25.0) + loofah (2.25.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -467,8 +468,8 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.2) - loofah (~> 2.21) + rails-html-sanitizer (1.7.0) + loofah (~> 2.25) 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) rails-i18n (7.0.1) i18n (>= 0.7, < 2) @@ -485,7 +486,7 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.3.1) - rdoc (7.1.0) + rdoc (7.2.0) erb psych (>= 4.0.0) tsort @@ -514,17 +515,17 @@ GEM rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.7) + rspec-mocks (3.13.8) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (8.0.2) + rspec-rails (8.0.4) actionpack (>= 7.2) activesupport (>= 7.2) railties (>= 7.2) - rspec-core (~> 3.13) - rspec-expectations (~> 3.13) - rspec-mocks (~> 3.13) - rspec-support (~> 3.13) + rspec-core (>= 3.13.0, < 5.0.0) + rspec-expectations (>= 3.13.0, < 5.0.0) + rspec-mocks (>= 3.13.0, < 5.0.0) + rspec-support (>= 3.13.0, < 5.0.0) rspec-support (3.13.7) rubocop (1.79.2) json (~> 2.3) @@ -671,7 +672,7 @@ GEM chronic (>= 0.6.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.7.4) + zeitwerk (2.7.5) PLATFORMS ruby From d588fb00dad4ad5fdfe81a50cae8e3009140ee01 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 17 Mar 2026 15:55:22 +0100 Subject: [PATCH 067/118] Fix too loose strong Booth parameters People should not be able to change the state, conference or timestamps of booths. --- app/controllers/booths_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/booths_controller.rb b/app/controllers/booths_controller.rb index f8057637..c3a34d63 100644 --- a/app/controllers/booths_controller.rb +++ b/app/controllers/booths_controller.rb @@ -94,7 +94,6 @@ class BoothsController < ApplicationController private def booth_params - params.require(:booth).permit(:title, :description, :reasoning, :state, :picture, :conference_id, - :created_at, :updated_at, :submitter_relationship, :website_url, responsible_ids: []) + params.require(:booth).permit(:title, :description, :reasoning, :picture, :website_url, :submitter_relationship, responsible_ids: []) end end From d6e36f2845ea6230c367c13080fdc6bbaa2f8542 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 17 Mar 2026 15:59:42 +0100 Subject: [PATCH 068/118] Fix too loose strong parameters in the admin interface There are some attributes that we don't use and/or that should not be changeable, even by admins. --- app/controllers/admin/booths_controller.rb | 3 +-- app/controllers/admin/difficulty_levels_controller.rb | 2 +- app/controllers/admin/event_types_controller.rb | 2 +- app/controllers/admin/events_controller.rb | 2 +- app/controllers/admin/lodgings_controller.rb | 2 +- app/controllers/admin/questions_controller.rb | 2 +- app/controllers/admin/registrations_controller.rb | 3 +-- app/controllers/admin/resources_controller.rb | 2 +- app/controllers/admin/sponsors_controller.rb | 2 +- app/controllers/admin/sponsorship_levels_controller.rb | 2 +- app/controllers/admin/tickets_controller.rb | 2 +- app/controllers/admin/venues_controller.rb | 2 +- 12 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/controllers/admin/booths_controller.rb b/app/controllers/admin/booths_controller.rb index 0a899921..0d235b98 100644 --- a/app/controllers/admin/booths_controller.rb +++ b/app/controllers/admin/booths_controller.rb @@ -130,8 +130,7 @@ module Admin end def booth_params - params.require(:booth).permit(:title, :description, :reasoning, :state, :picture, :conference_id, - :created_at, :updated_at, :submitter_relationship, :website_url, responsible_ids: []) + params.require(:booth).permit(:title, :description, :reasoning, :picture, :website_url, :submitter_relationship, responsible_ids: []) end end end diff --git a/app/controllers/admin/difficulty_levels_controller.rb b/app/controllers/admin/difficulty_levels_controller.rb index e5717f7e..0453542c 100644 --- a/app/controllers/admin/difficulty_levels_controller.rb +++ b/app/controllers/admin/difficulty_levels_controller.rb @@ -51,7 +51,7 @@ module Admin private def difficulty_level_params - params.require(:difficulty_level).permit(:title, :description, :color, :conference_id) + params.require(:difficulty_level).permit(:title, :description, :color) end end end diff --git a/app/controllers/admin/event_types_controller.rb b/app/controllers/admin/event_types_controller.rb index a171b427..81f3f1f8 100644 --- a/app/controllers/admin/event_types_controller.rb +++ b/app/controllers/admin/event_types_controller.rb @@ -49,7 +49,7 @@ module Admin private def event_type_params - params.require(:event_type).permit(:title, :length, :minimum_abstract_length, :maximum_abstract_length, :color, :conference_id, :description) + params.require(:event_type).permit(:title, :length, :minimum_abstract_length, :maximum_abstract_length, :color, :description) end end end diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index 27b19112..6f3227ef 100644 --- a/app/controllers/admin/events_controller.rb +++ b/app/controllers/admin/events_controller.rb @@ -178,7 +178,7 @@ module Admin end def comment_params - params.require(:comment).permit(:commentable, :body, :user_id) + params.require(:comment).permit(:body) end def update_state(transition, notice, mail = false, subject = false, send_mail = false) diff --git a/app/controllers/admin/lodgings_controller.rb b/app/controllers/admin/lodgings_controller.rb index 639e0544..56fc55d4 100644 --- a/app/controllers/admin/lodgings_controller.rb +++ b/app/controllers/admin/lodgings_controller.rb @@ -49,7 +49,7 @@ module Admin private def lodging_params - params.require(:lodging).permit(:name, :description, :picture, :picture_cache, :website_link, :conference_id) + params.require(:lodging).permit(:name, :description, :picture, :picture_cache, :website_link) end end end diff --git a/app/controllers/admin/questions_controller.rb b/app/controllers/admin/questions_controller.rb index b6451c92..6ebf67f5 100644 --- a/app/controllers/admin/questions_controller.rb +++ b/app/controllers/admin/questions_controller.rb @@ -97,7 +97,7 @@ module Admin private def question_params - params.require(:question).permit(:title, :global, :answer_ids, :question_type_id, :conference_id, answers_attributes: [:id, :title]) + params.require(:question).permit(:title, :global, :answer_ids, :question_type_id, answers_attributes: [:id, :title]) end def conference_params diff --git a/app/controllers/admin/registrations_controller.rb b/app/controllers/admin/registrations_controller.rb index 88027bbd..b36ab05c 100644 --- a/app/controllers/admin/registrations_controller.rb +++ b/app/controllers/admin/registrations_controller.rb @@ -82,8 +82,7 @@ module Admin def registration_params params.require(:registration).permit( - :user_id, :conference_id, :attended, - :volunteer, :other_special_needs, :accepted_code_of_conduct, + :attended, :volunteer, :other_special_needs, :accepted_code_of_conduct, vchoice_ids: [], qanswer_ids: [], qanswers_attributes: [], event_ids: [] ) end diff --git a/app/controllers/admin/resources_controller.rb b/app/controllers/admin/resources_controller.rb index a6e51e99..07ecb869 100644 --- a/app/controllers/admin/resources_controller.rb +++ b/app/controllers/admin/resources_controller.rb @@ -48,7 +48,7 @@ module Admin private def resource_params - params.require(:resource).permit(:name, :description, :quantity, :used, :conference_id) + params.require(:resource).permit(:name, :description, :quantity, :used) end end end diff --git a/app/controllers/admin/sponsors_controller.rb b/app/controllers/admin/sponsors_controller.rb index 656154d8..2e434f50 100644 --- a/app/controllers/admin/sponsors_controller.rb +++ b/app/controllers/admin/sponsors_controller.rb @@ -52,7 +52,7 @@ module Admin private def sponsor_params - params.require(:sponsor).permit(:name, :description, :website_url, :picture, :picture_cache, :sponsorship_level_id, :conference_id) + params.require(:sponsor).permit(:name, :description, :website_url, :picture, :picture_cache, :sponsorship_level_id) end def sponsorship_level_required diff --git a/app/controllers/admin/sponsorship_levels_controller.rb b/app/controllers/admin/sponsorship_levels_controller.rb index 443aa8b9..b21cff87 100644 --- a/app/controllers/admin/sponsorship_levels_controller.rb +++ b/app/controllers/admin/sponsorship_levels_controller.rb @@ -61,7 +61,7 @@ module Admin private def sponsorship_level_params - params.require(:sponsorship_level).permit(:title, :conference_id) + params.require(:sponsorship_level).permit(:title) end end end diff --git a/app/controllers/admin/tickets_controller.rb b/app/controllers/admin/tickets_controller.rb index e0e5b186..388020a8 100644 --- a/app/controllers/admin/tickets_controller.rb +++ b/app/controllers/admin/tickets_controller.rb @@ -52,7 +52,7 @@ module Admin private def ticket_params - params.require(:ticket).permit(:conference, :title, :url, :description, :conference_id, :price_cents, :price_currency, :price, :registration_ticket) + params.require(:ticket).permit(:title, :url, :description, :price_cents, :price_currency, :price, :registration_ticket) end end end diff --git a/app/controllers/admin/venues_controller.rb b/app/controllers/admin/venues_controller.rb index 17ba4c99..7383fcef 100644 --- a/app/controllers/admin/venues_controller.rb +++ b/app/controllers/admin/venues_controller.rb @@ -46,7 +46,7 @@ module Admin private def venue_params - params.require(:venue).permit(:name, :street, :postalcode, :city, :country, :longitude, :latitude, :description, :website, :picture, :picture_cache, :lodgings_attributes, :conference_id) + params.require(:venue).permit(:name, :street, :postalcode, :city, :country, :longitude, :latitude, :description, :website, :picture, :picture_cache, :lodgings_attributes) end end end From 76c9a5330edd7b92c0451003381a531ed40dd6ee Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 17 Mar 2026 16:01:48 +0100 Subject: [PATCH 069/118] Fix too loose registration strong parameters --- app/controllers/conference_registrations_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/conference_registrations_controller.rb b/app/controllers/conference_registrations_controller.rb index 70cfc736..764438b2 100644 --- a/app/controllers/conference_registrations_controller.rb +++ b/app/controllers/conference_registrations_controller.rb @@ -110,7 +110,6 @@ class ConferenceRegistrationsController < ApplicationController def registration_params params.require(:registration) .permit( - :conference_id, :volunteer, :accepted_code_of_conduct, vchoice_ids: [], qanswer_ids: [], qanswers_attributes: [], From 3494b91f4d7c3d7038f9b847367b0f13cf141694 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Wed, 18 Mar 2026 13:11:17 +0100 Subject: [PATCH 070/118] Fix parameter generation for activating a schedule Also: `@program` is instantiated via `load_and_authorize_resource` already... --- app/controllers/admin/programs_controller.rb | 2 +- app/views/admin/schedules/show.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/programs_controller.rb b/app/controllers/admin/programs_controller.rb index d47d4d1d..d94b65f9 100644 --- a/app/controllers/admin/programs_controller.rb +++ b/app/controllers/admin/programs_controller.rb @@ -11,7 +11,7 @@ module Admin def update authorize! :update, @conference.program - @program = @conference.program + params['program']['languages'] = params['program']['languages'].join(',') if params['program']['languages'].present? @program.assign_attributes(program_params) send_mail_on_schedule_public = @program.notify_on_schedule_public? diff --git a/app/views/admin/schedules/show.html.haml b/app/views/admin/schedules/show.html.haml index df864b88..ee4ed7b5 100644 --- a/app/views/admin/schedules/show.html.haml +++ b/app/views/admin/schedules/show.html.haml @@ -17,7 +17,7 @@ url = update_selected_schedule_admin_conference_program_track_path(@conference.short_title, @schedule.track) + '?[track][selected_schedule_id]=' else value = @schedule.id == @selected_schedule.try(:id) - url = admin_conference_program_path(@conference.short_title) + '?[program][selected_schedule_id]=' + url = admin_conference_program_path(@conference.short_title) + '?program[selected_schedule_id]=' end = check_box_tag @conference.short_title, @schedule.id, value, url: url, class: 'switch-checkbox-schedule' From 0e94be07745d312b69679763d81e75033bc3d68f Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 00:00:16 +0000 Subject: [PATCH 071/118] Update Ruby to version 3.4.9 --- .ruby-version | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index 7921bd0c..7bcbb380 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.8 +3.4.9 diff --git a/Gemfile.lock b/Gemfile.lock index b1fcb197..b8eceb70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -779,7 +779,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 3.4.8 + ruby 3.4.9 BUNDLED WITH 2.6.9 From a4386334ed541d9d75d5546847e46f30494075b5 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 14:05:32 +0000 Subject: [PATCH 072/118] Update json to version 2.19.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b8eceb70..38fd9d4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.18.1) + json (2.19.2) json-schema (6.0.0) addressable (~> 2.8) bigdecimal (~> 3.1) From 91ab8c7814d96e384505b225765d9b58c4294b7d Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 18:06:11 +0000 Subject: [PATCH 073/118] Update bcrypt to version 3.1.22 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b8eceb70..69302979 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM awesome_nested_set (3.8.0) activerecord (>= 4.0.0, < 8.1) base64 (0.3.0) - bcrypt (3.1.21) + bcrypt (3.1.22) benchmark (0.5.0) bigdecimal (3.3.1) bindex (0.8.1) From 70128c828054b2524bcac22a79f31e75e0a82d42 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2026 13:25:11 +0000 Subject: [PATCH 074/118] Update omniauth-google-oauth2 to version 1.2.2 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 38fd9d4c..8cb208b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -371,13 +371,13 @@ GEM omniauth-github (2.0.1) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8) - omniauth-google-oauth2 (1.2.1) + omniauth-google-oauth2 (1.2.2) jwt (>= 2.9.2) oauth2 (~> 2.0) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8) - omniauth-oauth2 (1.8.0) - oauth2 (>= 1.4, < 3) + omniauth-oauth2 (1.9.0) + oauth2 (>= 2.0.2, < 3) omniauth (~> 2.0) omniauth-openid (2.0.2) omniauth (>= 1.1) From 14b022d8c7915aceadca86ed9cfc0a37bd864062 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2026 20:05:21 +0000 Subject: [PATCH 075/118] Update icalendar to version 2.12.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a96a41a9..c58c572b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -246,7 +246,7 @@ GEM i18n (1.14.8) concurrent-ruby (~> 1.0) i18n_data (0.13.0) - icalendar (2.11.2) + icalendar (2.12.2) base64 ice_cube (~> 0.16) logger From d652179f59a08a20b2c3cb948e674f06f650b788 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 3 Apr 2026 17:50:20 +0000 Subject: [PATCH 076/118] Update parser to version 3.3.11.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c58c572b..71a3374d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -393,7 +393,7 @@ GEM activerecord (>= 6.1) request_store (~> 1.4) parallel (1.27.0) - parser (3.3.10.1) + parser (3.3.11.1) ast (~> 2.4.1) racc pdf-core (0.10.0) From b846b3fca987be8fa0fe2668e19391be34ac0fe4 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2026 02:25:19 +0000 Subject: [PATCH 077/118] Update addressable to version 2.9.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c58c572b..7a3fd667 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM awesome_nested_set (>= 2.0) acts_as_list (1.0.4) activerecord (>= 4.2) - addressable (2.8.8) + addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) afm (1.0.0) ajax-datatables-rails (1.3.1) @@ -427,7 +427,7 @@ GEM psych (5.3.1) date stringio - public_suffix (7.0.2) + public_suffix (7.0.5) puma (6.6.1) nio4r (~> 2.0) racc (1.8.1) From 95c81938d0c2368c71083ae39642157f9f79f28b Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2026 02:35:15 +0000 Subject: [PATCH 078/118] Update rack-session to version 2.1.2 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c58c572b..ee740987 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -431,7 +431,7 @@ GEM puma (6.6.1) nio4r (~> 2.0) racc (1.8.1) - rack (3.2.5) + rack (3.2.6) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -439,7 +439,7 @@ GEM base64 (>= 0.1.0) logger (>= 1.6.0) rack (>= 3.0.0, < 4) - rack-session (2.1.1) + rack-session (2.1.2) base64 (>= 0.1.0) rack (>= 3.0.0) rack-test (2.2.0) From ba59f4b5c8a439288683cf1b53757250b50983fb Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2026 14:45:12 +0000 Subject: [PATCH 079/118] Update fastimage to version 2.4.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9a35ea62..e79020c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,7 +213,7 @@ GEM multipart-post (~> 2.0) faraday-net_http (3.4.2) net-http (~> 0.5) - fastimage (2.4.0) + fastimage (2.4.1) feature (1.4.0) ffi (1.17.3) font-awesome-sass (6.7.2) From e4d15aa1f717278003da5bcbdd36ca47326c237f Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2026 14:50:14 +0000 Subject: [PATCH 080/118] Update nokogiri to version 1.19.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9a35ea62..432188fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -350,7 +350,7 @@ GEM next_rails (1.4.6) rainbow (>= 3) nio4r (2.7.5) - nokogiri (1.19.1) + nokogiri (1.19.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth2 (2.0.18) From 99d0e2257b3460997a69caefd3c3b727d030ec53 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2026 15:00:14 +0000 Subject: [PATCH 081/118] Update next_rails to version 1.4.8 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 10425851..3d05b289 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -347,7 +347,7 @@ GEM timeout net-smtp (0.5.1) net-protocol - next_rails (1.4.6) + next_rails (1.4.8) rainbow (>= 3) nio4r (2.7.5) nokogiri (1.19.2) From ee48f02425de98233a26840d587bd8ad5a4f96b7 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 8 Apr 2026 15:05:12 +0000 Subject: [PATCH 082/118] Update ffi to version 1.17.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 10425851..be3bff39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,7 +215,7 @@ GEM net-http (~> 0.5) fastimage (2.4.1) feature (1.4.0) - ffi (1.17.3) + ffi (1.17.4) font-awesome-sass (6.7.2) sassc (~> 2.0) geckodriver-helper (0.24.0) From 57846bf7ee4b03092e084fe809437e398ce5dd84 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 09:10:12 +0000 Subject: [PATCH 083/118] Update json to version 2.19.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3d05b289..28a090b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.19.2) + json (2.19.3) json-schema (6.0.0) addressable (~> 2.8) bigdecimal (~> 3.1) From baaf6f9378e03d3be7b715150c408f3f84179d63 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 09:15:12 +0000 Subject: [PATCH 084/118] Update minitest to version 6.0.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 43256663..0b130fdf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -320,7 +320,7 @@ GEM logger mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (6.0.2) + minitest (6.0.3) drb (~> 2.0) prism (~> 1.5) monetize (1.9.4) From 14b636cd85fc700e61eabc51006e4a4d57a213e9 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 11:00:14 +0000 Subject: [PATCH 085/118] Update acts_as_list to version 1.2.6 --- Gemfile.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 367da527..6d17f8ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,8 +84,9 @@ GEM activerecord (>= 3.0) activesupport (>= 3.0) awesome_nested_set (>= 2.0) - acts_as_list (1.0.4) - activerecord (>= 4.2) + acts_as_list (1.2.6) + activerecord (>= 6.1) + activesupport (>= 6.1) addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) afm (1.0.0) @@ -628,7 +629,7 @@ GEM thor (1.5.0) tilt (2.6.1) timecop (0.9.4) - timeout (0.4.3) + timeout (0.6.1) transitions (1.2.1) tsort (0.2.0) ttfunk (1.8.0) From 36d97ac4053364f7825e4ee0b8b773712aeb2dd3 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 11:05:12 +0000 Subject: [PATCH 086/118] Update jquery-rails to version 4.6.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 367da527..12a7ccc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -269,7 +269,7 @@ GEM jquery-rails railties (>= 3.1) sass-rails - jquery-rails (4.4.0) + jquery-rails (4.6.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) From c8b94ce8b73da8be3c27dce78cdc48ae0c35d3b6 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 11:10:12 +0000 Subject: [PATCH 087/118] Update mail to version 2.9.0 --- Gemfile.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 367da527..913f70da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -307,7 +307,8 @@ GEM loofah (2.25.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) + mail (2.9.0) + logger mini_mime (>= 0.1.1) net-imap net-pop @@ -338,7 +339,7 @@ GEM multipart-post (2.4.1) net-http (0.9.1) uri (>= 0.11.1) - net-imap (0.5.10) + net-imap (0.6.3) date net-protocol net-pop (0.1.2) @@ -628,7 +629,7 @@ GEM thor (1.5.0) tilt (2.6.1) timecop (0.9.4) - timeout (0.4.3) + timeout (0.6.1) transitions (1.2.1) tsort (0.2.0) ttfunk (1.8.0) From 22aa9a33dbd401b323acc42370bbe90f7fe0d697 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 9 Apr 2026 11:40:12 +0000 Subject: [PATCH 088/118] Update htmlentities to version 4.4.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 25170af5..00c392be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,7 +243,7 @@ GEM hashery (2.1.2) hashie (5.1.0) logger - htmlentities (4.3.4) + htmlentities (4.4.2) i18n (1.14.8) concurrent-ruby (~> 1.0) i18n_data (0.13.0) From 76509f739daa98f191d2470e965a502d4fbb5d5e Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2026 12:05:11 +0000 Subject: [PATCH 089/118] Update recaptcha to version 5.21.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 00c392be..6f19689c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -492,7 +492,7 @@ GEM erb psych (>= 4.0.0) tsort - recaptcha (5.21.1) + recaptcha (5.21.2) redcarpet (3.6.1) regexp_parser (2.11.3) reline (0.6.3) From c9a4604fc26f064034485962283eb2808464a615 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2026 14:25:12 +0000 Subject: [PATCH 090/118] Update dotenv-rails to version 3.2.0 --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6f19689c..0862ace4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -189,12 +189,12 @@ GEM devise (>= 2.2) diff-lcs (1.6.2) docile (1.4.1) - dotenv (3.1.8) - dotenv-rails (3.1.8) - dotenv (= 3.1.8) + dotenv (3.2.0) + dotenv-rails (3.2.0) + dotenv (= 3.2.0) railties (>= 6.1) drb (2.2.3) - erb (6.0.2) + erb (6.0.3) erubi (1.13.1) execjs (2.8.1) factory_bot (6.5.6) @@ -322,7 +322,7 @@ GEM logger mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (6.0.3) + minitest (6.0.4) drb (~> 2.0) prism (~> 1.5) monetize (1.9.4) @@ -487,7 +487,7 @@ GEM tsort (>= 0.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.3.1) + rake (13.4.2) rdoc (7.2.0) erb psych (>= 4.0.0) From 96f712a1f81ff47e2b191713ed25238bb9105ab4 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2026 14:40:12 +0000 Subject: [PATCH 091/118] Update active_model_serializers to version 0.10.16 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0862ace4..e25a3ff3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,7 @@ GEM erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - active_model_serializers (0.10.15) + active_model_serializers (0.10.16) actionpack (>= 4.1) activemodel (>= 4.1) case_transform (>= 0.2) From dc1ce6318b427da313d21c8531e68c51bba79cc9 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 5 May 2026 00:05:37 +0000 Subject: [PATCH 092/118] Update net-imap to version 0.6.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0862ace4..3020957f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -340,7 +340,7 @@ GEM multipart-post (2.4.1) net-http (0.9.1) uri (>= 0.11.1) - net-imap (0.6.3) + net-imap (0.6.4) date net-protocol net-pop (0.1.2) From 0861ca9dbc294d2b65b4411b2acae4d8f4579a3c Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 8 May 2026 16:05:28 +0000 Subject: [PATCH 093/118] Update devise to version 5.0.4 --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0862ace4..bc328b4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM delayed_job_active_record (4.1.11) activerecord (>= 3.0, < 9.0) delayed_job (>= 3.0, < 5) - devise (5.0.3) + devise (5.0.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 7.0) @@ -194,7 +194,7 @@ GEM dotenv (= 3.2.0) railties (>= 6.1) drb (2.2.3) - erb (6.0.3) + erb (6.0.4) erubi (1.13.1) execjs (2.8.1) factory_bot (6.5.6) @@ -258,7 +258,7 @@ GEM ruby-vips (>= 2.0.17, < 3) io-console (0.8.2) io-like (0.4.0) - irb (1.17.0) + irb (1.18.0) pp (>= 0.6.0) prism (>= 1.3.0) rdoc (>= 4.0.0) @@ -322,7 +322,7 @@ GEM logger mini_mime (1.1.5) mini_portile2 (2.8.9) - minitest (6.0.4) + minitest (6.0.6) drb (~> 2.0) prism (~> 1.5) monetize (1.9.4) @@ -352,7 +352,7 @@ GEM next_rails (1.4.8) rainbow (>= 3) nio4r (2.7.5) - nokogiri (1.19.2) + nokogiri (1.19.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth2 (2.0.18) From f4230eece1b1f248e3f5a2c134b6ec0afb414019 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Mon, 18 May 2026 16:10:14 +0000 Subject: [PATCH 094/118] Update faraday to version 2.14.2 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3516ba95..bb8ff356 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -204,7 +204,7 @@ GEM railties (>= 6.1.0) faker (3.5.2) i18n (>= 1.8.11, < 2) - faraday (2.14.1) + faraday (2.14.2) faraday-net_http (>= 2.0, < 3.5) json logger @@ -276,7 +276,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.19.3) + json (2.19.5) json-schema (6.0.0) addressable (~> 2.8) bigdecimal (~> 3.1) From c6b012868d1b5aef84c4212de9dada81636ea203 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Mon, 18 May 2026 18:05:45 +0000 Subject: [PATCH 095/118] Update jwt to version 3.2.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3516ba95..a3c8556d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -281,7 +281,7 @@ GEM addressable (~> 2.8) bigdecimal (~> 3.1) jsonapi-renderer (0.2.2) - jwt (3.1.2) + jwt (3.2.0) base64 language_server-protocol (3.17.0.5) launchy (3.1.1) From 9b5f97c00a91260570c9fdc2b2ef42d99190553e Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 27 May 2026 02:07:07 +0000 Subject: [PATCH 096/118] Update carrierwave to version 3.1.3 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9554848d..f21ae69b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,7 +120,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (3.1.2) + carrierwave (3.1.3) activemodel (>= 6.0.0) activesupport (>= 6.0.0) addressable (~> 2.6) @@ -570,7 +570,7 @@ GEM ruby-openid (2.9.2) ruby-progressbar (1.13.0) ruby-rc4 (0.1.5) - ruby-vips (2.2.5) + ruby-vips (2.3.0) ffi (~> 1.12) logger rubyzip (2.4.1) @@ -618,7 +618,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - ssrf_filter (1.3.0) + ssrf_filter (1.5.0) stringio (3.2.0) stripe (5.43.0) stripe-ruby-mock (3.1.0.rc3) From f66eb8393c2b78135c32065b3f9a405ddb4e2255 Mon Sep 17 00:00:00 2001 From: Mridankan Mandal Date: Sun, 31 May 2026 21:23:54 +0530 Subject: [PATCH 097/118] fix(auth): allow event commercial management Non-admin proposal flow uses Ability, not AdminAbility, so organizers and CFP users could edit proposals but could not create event commercials. Closes #3143. Signed-off-by: Mridankan Mandal --- app/models/ability.rb | 4 ++ spec/ability/ability_spec.rb | 26 ++++++++ .../commercials_controller_spec.rb | 59 +++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 spec/controllers/commercials_controller_spec.rb diff --git a/app/models/ability.rb b/app/models/ability.rb index 08ef50a9..26ce7bf5 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -152,6 +152,8 @@ class Ability can :manage, Registration, conference_id: conf_ids_for_organizer # To access conference/proposals can :manage, Event, program: { conference_id: conf_ids_for_organizer } + can :manage, Commercial, commercialable_type: 'Event', + commercialable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_organizer).pluck(:id)).pluck(:id) # To access comment link in menu bar can :index, Comment, commentable_type: 'Event', commentable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_organizer).pluck(:id)).pluck(:id) @@ -163,6 +165,8 @@ class Ability commentable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_cfp).pluck(:id)).pluck(:id) # To access conference/proposals can :manage, Event, program: { conference_id: conf_ids_for_cfp } + can :manage, Commercial, commercialable_type: 'Event', + commercialable_id: Event.where(program_id: Program.where(conference_id: conf_ids_for_cfp).pluck(:id)).pluck(:id) end if conf_ids_for_info_desk diff --git a/spec/ability/ability_spec.rb b/spec/ability/ability_spec.rb index 0f3438ac..6abf860f 100644 --- a/spec/ability/ability_spec.rb +++ b/spec/ability/ability_spec.rb @@ -264,5 +264,31 @@ describe 'User' do it{ should_not be_able_to(:edit, other_self_organized_track) } it{ should_not be_able_to(:update, other_self_organized_track) } end + + context 'when user is organizer of conference' do + let(:conference) { create(:conference) } + let(:user) { create(:organizer, resource: conference) } + let(:event_in_conference) { create(:event, program: conference.program) } + let(:event_in_other_conference) { create(:event) } + let(:commercial_in_conference) { create(:commercial, commercialable: event_in_conference) } + let(:commercial_in_other_conference) { create(:commercial, commercialable: event_in_other_conference) } + + it{ should be_able_to(:create, event_in_conference.commercials.new) } + it{ should be_able_to(:manage, commercial_in_conference) } + it{ should_not be_able_to(:manage, commercial_in_other_conference) } + end + + context 'when user is on cfp team of conference' do + let(:conference) { create(:conference) } + let(:user) { create(:cfp_user, resource: conference) } + let(:event_in_conference) { create(:event, program: conference.program) } + let(:event_in_other_conference) { create(:event) } + let(:commercial_in_conference) { create(:commercial, commercialable: event_in_conference) } + let(:commercial_in_other_conference) { create(:commercial, commercialable: event_in_other_conference) } + + it{ should be_able_to(:create, event_in_conference.commercials.new) } + it{ should be_able_to(:manage, commercial_in_conference) } + it{ should_not be_able_to(:manage, commercial_in_other_conference) } + end end end diff --git a/spec/controllers/commercials_controller_spec.rb b/spec/controllers/commercials_controller_spec.rb new file mode 100644 index 00000000..74696ed9 --- /dev/null +++ b/spec/controllers/commercials_controller_spec.rb @@ -0,0 +1,59 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe CommercialsController do + let(:conference) { create(:conference) } + let(:event) { create(:event, program: conference.program) } + let(:commercial_params) do + { + conference_id: conference.short_title, + proposal_id: event.id, + commercial: { url: 'https://www.youtube.com/watch?v=M9bq_alk-sw' } + } + end + + describe 'POST #create' do + context 'when user is organizer of conference' do + let(:user) { create(:organizer, resource: conference) } + + before do + sign_in user + end + + it 'creates a commercial for the event' do + expect do + post :create, params: commercial_params + end.to change(Commercial, :count).by(1) + end + + it 'redirects to proposal edit page' do + post :create, params: commercial_params + + expect(response).to redirect_to(edit_conference_program_proposal_path(conference.short_title, event.id, anchor: 'commercials-content')) + expect(flash[:notice]).to eq('Commercial was successfully created.') + end + end + + context 'when user is on cfp team of conference' do + let(:user) { create(:cfp_user, resource: conference) } + + before do + sign_in user + end + + it 'creates a commercial for the event' do + expect do + post :create, params: commercial_params + end.to change(Commercial, :count).by(1) + end + + it 'redirects to proposal edit page' do + post :create, params: commercial_params + + expect(response).to redirect_to(edit_conference_program_proposal_path(conference.short_title, event.id, anchor: 'commercials-content')) + expect(flash[:notice]).to eq('Commercial was successfully created.') + end + end + end +end From 75344ae4a039f8c6f1ea7e0b692ad09fece36388 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2026 00:10:33 +0000 Subject: [PATCH 098/118] Update puma to version 8.0.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f21ae69b..ba64b672 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -430,7 +430,7 @@ GEM date stringio public_suffix (7.0.5) - puma (6.6.1) + puma (8.0.2) nio4r (~> 2.0) racc (1.8.1) rack (3.2.6) From 8125ffa81862f6007c4fa9a5ccc82ec72a24fbb6 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2026 20:10:16 +0000 Subject: [PATCH 099/118] Update net-imap to version 0.6.4.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f21ae69b..39fece97 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -340,7 +340,7 @@ GEM multipart-post (2.4.1) net-http (0.9.1) uri (>= 0.11.1) - net-imap (0.6.4) + net-imap (0.6.4.1) date net-protocol net-pop (0.1.2) From 4c19375c6a311eeed99660a4554286e3ed753b57 Mon Sep 17 00:00:00 2001 From: Mridankan Mandal Date: Thu, 18 Jun 2026 00:24:34 +0530 Subject: [PATCH 100/118] test: drop redundant controller spec Signed-off-by: Mridankan Mandal --- .../commercials_controller_spec.rb | 59 ------------------- 1 file changed, 59 deletions(-) delete mode 100644 spec/controllers/commercials_controller_spec.rb diff --git a/spec/controllers/commercials_controller_spec.rb b/spec/controllers/commercials_controller_spec.rb deleted file mode 100644 index 74696ed9..00000000 --- a/spec/controllers/commercials_controller_spec.rb +++ /dev/null @@ -1,59 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe CommercialsController do - let(:conference) { create(:conference) } - let(:event) { create(:event, program: conference.program) } - let(:commercial_params) do - { - conference_id: conference.short_title, - proposal_id: event.id, - commercial: { url: 'https://www.youtube.com/watch?v=M9bq_alk-sw' } - } - end - - describe 'POST #create' do - context 'when user is organizer of conference' do - let(:user) { create(:organizer, resource: conference) } - - before do - sign_in user - end - - it 'creates a commercial for the event' do - expect do - post :create, params: commercial_params - end.to change(Commercial, :count).by(1) - end - - it 'redirects to proposal edit page' do - post :create, params: commercial_params - - expect(response).to redirect_to(edit_conference_program_proposal_path(conference.short_title, event.id, anchor: 'commercials-content')) - expect(flash[:notice]).to eq('Commercial was successfully created.') - end - end - - context 'when user is on cfp team of conference' do - let(:user) { create(:cfp_user, resource: conference) } - - before do - sign_in user - end - - it 'creates a commercial for the event' do - expect do - post :create, params: commercial_params - end.to change(Commercial, :count).by(1) - end - - it 'redirects to proposal edit page' do - post :create, params: commercial_params - - expect(response).to redirect_to(edit_conference_program_proposal_path(conference.short_title, event.id, anchor: 'commercials-content')) - expect(flash[:notice]).to eq('Commercial was successfully created.') - end - end - end -end From 6341d1e3b3029c96156be8eaf0252c2a86099c22 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2026 18:15:40 +0000 Subject: [PATCH 101/118] Update nokogiri to version 1.19.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb9eb4cb..96978001 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -352,7 +352,7 @@ GEM next_rails (1.4.8) rainbow (>= 3) nio4r (2.7.5) - nokogiri (1.19.3) + nokogiri (1.19.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth2 (2.0.18) From 70f61787b6d0a556c301bdf006fe3882839966f5 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2026 20:12:42 +0000 Subject: [PATCH 102/118] Update faraday to version 2.14.3 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb9eb4cb..2baccd0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -204,7 +204,7 @@ GEM railties (>= 6.1.0) faker (3.5.2) i18n (>= 1.8.11, < 2) - faraday (2.14.2) + faraday (2.14.3) faraday-net_http (>= 2.0, < 3.5) json logger @@ -212,7 +212,7 @@ GEM faraday (>= 1, < 3) faraday-multipart (1.1.1) multipart-post (~> 2.0) - faraday-net_http (3.4.2) + faraday-net_http (3.4.4) net-http (~> 0.5) fastimage (2.4.1) feature (1.4.0) @@ -276,7 +276,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.19.5) + json (2.19.9) json-schema (6.0.0) addressable (~> 2.8) bigdecimal (~> 3.1) From 1346187fa6867e27e809ddf299ec1fb8f0125318 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2026 22:20:35 +0000 Subject: [PATCH 103/118] Update concurrent-ruby to version 1.3.7 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb9eb4cb..2fdbf901 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,7 +154,7 @@ GEM faraday-multipart (~> 1.0, >= 1.0.4) ostruct cocoon (1.2.15) - concurrent-ruby (1.3.6) + concurrent-ruby (1.3.7) connection_pool (2.5.5) countable-rails (0.0.1) railties (>= 3.1) From 6aef4883a3e8d0c6bc258efeb0c14e79e2d63ab3 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2026 00:00:18 +0000 Subject: [PATCH 104/118] Update Ruby to version 3.4.10 --- .ruby-version | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index 7bcbb380..84d6c676 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.9 +3.4.10 diff --git a/Gemfile.lock b/Gemfile.lock index 6da52e2e..d807e864 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -781,7 +781,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 3.4.9 + ruby 3.4.10 BUNDLED WITH 2.6.9 From f525469c52de413dd69ef9c348aebca17fde2f2e Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2026 00:06:35 +0000 Subject: [PATCH 105/118] Update websocket-driver to version 0.8.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6da52e2e..da7384dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -666,7 +666,7 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) websocket (1.2.11) - websocket-driver (0.8.0) + websocket-driver (0.8.2) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) From 1cd22381fc46fc03bbdc8cc30cb97c2d910d4383 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 16:10:35 +0000 Subject: [PATCH 106/118] Update loofah to version 2.25.2 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6da52e2e..f58f3e42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,7 +160,7 @@ GEM railties (>= 3.1) crack (0.4.5) rexml - crass (1.0.6) + crass (1.0.7) csv (3.3.5) daemons (1.4.0) dalli (2.7.11) @@ -305,7 +305,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.25.1) + loofah (2.25.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.9.0) From 399d174fa94fa0e8f1bee979c6e79e6551f3b7e6 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 22 Jul 2026 00:17:03 +0000 Subject: [PATCH 107/118] Update rails-html-sanitizer to version 1.7.1 --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6da52e2e..844c51e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,7 +160,7 @@ GEM railties (>= 3.1) crack (0.4.5) rexml - crass (1.0.6) + crass (1.0.7) csv (3.3.5) daemons (1.4.0) dalli (2.7.11) @@ -305,7 +305,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.25.1) + loofah (2.25.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.9.0) @@ -470,8 +470,8 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.7.0) - loofah (~> 2.25) + rails-html-sanitizer (1.7.1) + loofah (~> 2.25, >= 2.25.2) 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) rails-i18n (7.0.1) i18n (>= 0.7, < 2) From 4dbb1bba27aa9aa4f54b1a279a51653275d72e18 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2026 18:06:15 +0000 Subject: [PATCH 108/118] Update oauth2 to version 2.0.25 --- Gemfile.lock | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6da52e2e..c012e06a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,9 +92,13 @@ GEM afm (1.0.0) ajax-datatables-rails (1.3.1) zeitwerk + anonymous_loader (0.1.3) + version_gem (~> 1.1, >= 1.1.14) archive-zip (0.13.1) io-like (~> 0.4.0) ast (2.4.3) + auth-sanitizer (0.2.3) + version_gem (~> 1.1, >= 1.1.14) autoprefixer-rails (10.3.1.0) execjs (~> 2) awesome_nested_set (3.8.0) @@ -276,7 +280,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.19.9) + json (2.21.1) json-schema (6.0.0) addressable (~> 2.8) bigdecimal (~> 3.1) @@ -335,7 +339,7 @@ GEM money (~> 6.13.2) railties (>= 3.0) multi_json (1.17.0) - multi_xml (0.8.1) + multi_xml (0.9.1) bigdecimal (>= 3.1, < 5) multipart-post (2.4.1) net-http (0.9.1) @@ -355,14 +359,16 @@ GEM nokogiri (1.19.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oauth2 (2.0.18) + oauth2 (2.0.25) + anonymous_loader (~> 0.1, >= 0.1.3) + auth-sanitizer (~> 0.2, >= 0.2.3) faraday (>= 0.17.3, < 4.0) jwt (>= 1.0, < 4.0) logger (~> 1.2) multi_xml (~> 0.5) rack (>= 1.2, < 4) - snaky_hash (~> 2.0, >= 2.0.3) - version_gem (~> 1.1, >= 1.1.9) + snaky_hash (~> 2.0, >= 2.0.7) + version_gem (~> 1.1, >= 1.1.14) omniauth (2.1.4) hashie (>= 3.4.6) logger @@ -607,9 +613,9 @@ GEM simplecov (~> 0.19) simplecov-html (0.13.2) simplecov_json_formatter (0.1.4) - snaky_hash (2.0.3) + snaky_hash (2.0.7) hashie (>= 0.1.0, < 6) - version_gem (>= 1.1.8, < 3) + version_gem (~> 1.1, >= 1.1.14) sprockets (4.2.2) concurrent-ruby (~> 1.0) logger @@ -649,7 +655,7 @@ GEM railties uri (1.1.1) useragent (0.16.11) - version_gem (1.1.9) + version_gem (1.1.14) warden (1.2.9) rack (>= 2.0.9) web-console (4.1.0) From e6988e84188ecc7619f6f20aefaaceaeb1c7d1c0 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 7 Aug 2026 14:15:27 +0000 Subject: [PATCH 109/118] Update icalendar to version 2.12.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6da52e2e..a4045d0b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -247,7 +247,7 @@ GEM i18n (1.14.8) concurrent-ruby (~> 1.0) i18n_data (0.13.0) - icalendar (2.12.2) + icalendar (2.12.4) base64 ice_cube (~> 0.16) logger From fc3d09808f2ad5fb0a02d9b69d1ec72b43088b47 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 11 Aug 2026 09:27:35 +0000 Subject: [PATCH 110/118] Update cancancan to version 3.6.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 48c33973..32c079cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,7 @@ GEM bootstrap-switch-rails (3.3.3) builder (3.3.0) byebug (12.0.0) - cancancan (3.3.0) + cancancan (3.6.1) capybara (3.40.0) addressable matrix From f2e63bb57062e79921ac960d8134416308a9344e Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 11 Aug 2026 09:55:33 +0000 Subject: [PATCH 111/118] Update mail to version 2.9.1 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a3eb6803..5adf5fbd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,7 +312,7 @@ GEM loofah (2.25.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.9.0) + mail (2.9.1) logger mini_mime (>= 0.1.1) net-imap @@ -344,7 +344,7 @@ GEM multipart-post (2.4.1) net-http (0.9.1) uri (>= 0.11.1) - net-imap (0.6.4.1) + net-imap (0.6.6) date net-protocol net-pop (0.1.2) From 18bba1ae8c5c89454f2193e9325feddb0839f62d Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 11 Aug 2026 10:00:30 +0000 Subject: [PATCH 112/118] Update language_server-protocol to version 3.17.0.6 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 94b6547e..ed4612ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -287,7 +287,7 @@ GEM jsonapi-renderer (0.2.2) jwt (3.2.0) base64 - language_server-protocol (3.17.0.5) + language_server-protocol (3.17.0.6) launchy (3.1.1) addressable (~> 2.8) childprocess (~> 5.0) From d2ce016030a19ef1abd954575251c299e427ccf4 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 11 Aug 2026 10:44:57 +0000 Subject: [PATCH 113/118] Update json to version 2.21.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 18c82050..b8972032 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,7 +280,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.21.1) + json (2.21.2) json-schema (6.0.0) addressable (~> 2.8) bigdecimal (~> 3.1) From c6b66dcce29065ccfee1d5b5116d90d99cb901ea Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 11 Aug 2026 10:45:26 +0000 Subject: [PATCH 114/118] Update mini_magick to version 5.3.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 18c82050..ffd92ab5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -322,7 +322,7 @@ GEM matrix (0.4.3) mina (1.2.5) rake - mini_magick (5.3.1) + mini_magick (5.3.2) logger mini_mime (1.1.5) mini_portile2 (2.8.9) From 9ccd5f0cb42c026d07bf2555caad07c209633def Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 11 Aug 2026 11:20:27 +0000 Subject: [PATCH 115/118] Update parser to version 3.3.12.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1d409ddf..507dd4ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -401,7 +401,7 @@ GEM activerecord (>= 6.1) request_store (~> 1.4) parallel (1.27.0) - parser (3.3.11.1) + parser (3.3.12.0) ast (~> 2.4.1) racc pdf-core (0.10.0) From 4c232869002b05b2e54bd88572a9e9b22535b7bd Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 11 Aug 2026 11:25:31 +0000 Subject: [PATCH 116/118] Update erb to version 6.0.6 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1d409ddf..88cc0ec1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -198,7 +198,7 @@ GEM dotenv (= 3.2.0) railties (>= 6.1) drb (2.2.3) - erb (6.0.4) + erb (6.0.6) erubi (1.13.1) execjs (2.8.1) factory_bot (6.5.6) From ef82ef8941e146b0749ff7db1c917f43ca5c0b5a Mon Sep 17 00:00:00 2001 From: gunghogeoduck Date: Wed, 12 Aug 2026 23:47:47 -0400 Subject: [PATCH 117/118] Updated banner color and initialized time parameters --- app/assets/stylesheets/strap-on.scss | 2 +- config/initializers/time_formats.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/strap-on.scss b/app/assets/stylesheets/strap-on.scss index feeecb29..5ed1f0bf 100644 --- a/app/assets/stylesheets/strap-on.scss +++ b/app/assets/stylesheets/strap-on.scss @@ -1,4 +1,4 @@ -$navbar-default-bg: #299a0b; +$navbar-default-bg: #005cb3; $navbar-default-link-active-bg: #DFE0DF; $navbar-default-border: 1px solid #d4d4d4; $navbar-default-color: #ffffff; diff --git a/config/initializers/time_formats.rb b/config/initializers/time_formats.rb index 41eeb416..575b44ae 100644 --- a/config/initializers/time_formats.rb +++ b/config/initializers/time_formats.rb @@ -1 +1 @@ -Time::DATE_FORMATS[:db_without_seconds] = '%Y-%m-%d %H:%M' +Time::DATE_FORMATS[:db_without_seconds] = '%Y-%m-%d %l:%M %p' From 68c5f5e32b473717c25f31d709a0a10298b89d16 Mon Sep 17 00:00:00 2001 From: gunghogeoduck Date: Wed, 19 Aug 2026 00:29:55 -0400 Subject: [PATCH 118/118] Merged Mythic's changes. --- Gemfile.next | 0 app/assets/stylesheets/strap-on.scss | 2 +- app/helpers/conference_helper.rb | 2 +- app/views/admin/difficulty_levels/edit.html.haml | 2 +- app/views/admin/difficulty_levels/index.html.haml | 4 ++-- app/views/admin/difficulty_levels/new.html.haml | 2 +- app/views/admin/events/index.html.haml | 2 +- app/views/admin/events/show.html.haml | 2 +- app/views/admin/programs/show.html.haml | 2 +- app/views/layouts/_admin_sidebar.html.haml | 2 +- app/views/proposals/_form.html.haml | 2 +- app/views/proposals/_tooltip.html.haml | 2 +- app/views/proposals/show.html.haml | 6 +++--- app/views/schedules/_carousel.html.haml | 4 +--- app/views/schedules/_event.html.haml | 4 ++-- app/views/schedules/events.html.haml | 15 +++++---------- bin/bundle | 0 bin/bundle_report | 0 bin/delayed_job | 0 bin/deprecations | 0 bin/gem-next-diff | 0 bin/next | 0 bin/rails | 0 bin/rake | 0 bin/rspec | 0 config/initializers/time_formats.rb | 2 +- spec/models/conference_spec.rb | 0 27 files changed, 24 insertions(+), 31 deletions(-) mode change 120000 => 100644 Gemfile.next mode change 100755 => 100644 bin/bundle mode change 100755 => 100644 bin/bundle_report mode change 100755 => 100644 bin/delayed_job mode change 100755 => 100644 bin/deprecations mode change 100755 => 100644 bin/gem-next-diff mode change 100755 => 100644 bin/next mode change 100755 => 100644 bin/rails mode change 100755 => 100644 bin/rake mode change 100755 => 100644 bin/rspec mode change 100755 => 100644 spec/models/conference_spec.rb diff --git a/Gemfile.next b/Gemfile.next deleted file mode 120000 index 6ab79009..00000000 --- a/Gemfile.next +++ /dev/null @@ -1 +0,0 @@ -Gemfile \ No newline at end of file diff --git a/Gemfile.next b/Gemfile.next new file mode 100644 index 00000000..6ab79009 --- /dev/null +++ b/Gemfile.next @@ -0,0 +1 @@ +Gemfile \ No newline at end of file diff --git a/app/assets/stylesheets/strap-on.scss b/app/assets/stylesheets/strap-on.scss index 5ed1f0bf..feeecb29 100644 --- a/app/assets/stylesheets/strap-on.scss +++ b/app/assets/stylesheets/strap-on.scss @@ -1,4 +1,4 @@ -$navbar-default-bg: #005cb3; +$navbar-default-bg: #299a0b; $navbar-default-link-active-bg: #DFE0DF; $navbar-default-border: 1px solid #d4d4d4; $navbar-default-color: #ffffff; diff --git a/app/helpers/conference_helper.rb b/app/helpers/conference_helper.rb index f685ed89..2ebeba84 100644 --- a/app/helpers/conference_helper.rb +++ b/app/helpers/conference_helper.rb @@ -45,7 +45,7 @@ module ConferenceHelper location += "#{v.country_name}, " if v.country_name e.location = location end - e.categories = conference.title, "Difficulty: #{proposal.difficulty_level.title}", "Track: #{proposal.track.name}" + e.categories = conference.title, "Audience: #{proposal.difficulty_level.title}", "Track: #{proposal.track.name}" end end calendar diff --git a/app/views/admin/difficulty_levels/edit.html.haml b/app/views/admin/difficulty_levels/edit.html.haml index baec7d47..5986918b 100644 --- a/app/views/admin/difficulty_levels/edit.html.haml +++ b/app/views/admin/difficulty_levels/edit.html.haml @@ -2,7 +2,7 @@ .col-md-12 .page-header %h1 - Edit Difficulty Level + Edit Audience = @difficulty_level.title .row .col-md-8 diff --git a/app/views/admin/difficulty_levels/index.html.haml b/app/views/admin/difficulty_levels/index.html.haml index 282fdfae..0ab6f53d 100644 --- a/app/views/admin/difficulty_levels/index.html.haml +++ b/app/views/admin/difficulty_levels/index.html.haml @@ -1,7 +1,7 @@ .row .col-md-12 .page-header - %h1 Difficulty Levels + %h1 Audiences %p.text-muted Classify your conference.program.events by difficulty .row @@ -32,4 +32,4 @@ data: { confirm: "Do you really want to delete #{difficulty_level.title}? Attention: This difficulty level will be removed from all Events that have it set" } .row .col-md-12.text-right - = link_to 'Add Difficulty Level', new_admin_conference_program_difficulty_level_path(@conference.short_title), class: 'btn btn-primary' + = link_to 'Add Audience', new_admin_conference_program_difficulty_level_path(@conference.short_title), class: 'btn btn-primary' diff --git a/app/views/admin/difficulty_levels/new.html.haml b/app/views/admin/difficulty_levels/new.html.haml index 6d8fc4de..55bacb47 100644 --- a/app/views/admin/difficulty_levels/new.html.haml +++ b/app/views/admin/difficulty_levels/new.html.haml @@ -2,7 +2,7 @@ .col-md-12 .page-header %h1 - Create Difficulty Level + Create Audience .row .col-md-8 = render partial: 'form' diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml index bb6db751..f3efb5b8 100644 --- a/app/views/admin/events/index.html.haml +++ b/app/views/admin/events/index.html.haml @@ -82,7 +82,7 @@ %th %b Track %th - %b Difficulty + %b Audience %th %b State %th diff --git a/app/views/admin/events/show.html.haml b/app/views/admin/events/show.html.haml index d19d056a..2166fc38 100644 --- a/app/views/admin/events/show.html.haml +++ b/app/views/admin/events/show.html.haml @@ -92,7 +92,7 @@ %td{ 'class' => class_for_todo(progress_status['track']) } %span{ 'class' => [icon_for_todo(progress_status['track']), 'fa-lg'] } %tr - %td= link_to 'Add a difficulty level', edit_admin_conference_program_event_path(@event.program.conference.short_title, @event) + %td= link_to 'Add an Audience level', edit_admin_conference_program_event_path(@event.program.conference.short_title, @event) %td{ 'class' => class_for_todo(progress_status['difficulty_level']) } %span{ 'class' => [icon_for_todo(progress_status['difficulty_level']), 'fa-lg'] } #proposal-commercials.tab-pane diff --git a/app/views/admin/programs/show.html.haml b/app/views/admin/programs/show.html.haml index db1e91ff..af8d6c1d 100644 --- a/app/views/admin/programs/show.html.haml +++ b/app/views/admin/programs/show.html.haml @@ -28,7 +28,7 @@ %dd = tracks(@conference) %dt - Difficulty Levels: + Audiences: %dd = difficulty_levels(@conference) %dt diff --git a/app/views/layouts/_admin_sidebar.html.haml b/app/views/layouts/_admin_sidebar.html.haml index f4c20006..b7fa4791 100644 --- a/app/views/layouts/_admin_sidebar.html.haml +++ b/app/views/layouts/_admin_sidebar.html.haml @@ -80,7 +80,7 @@ = link_to 'Event Types', admin_conference_program_event_types_path(@conference.short_title) - if can? :update, @conference.program.difficulty_levels.build, conference_id: @conference.id %li{class: active_nav_li(admin_conference_program_difficulty_levels_path(@conference.short_title))} - = link_to 'Difficulty Levels', admin_conference_program_difficulty_levels_path(@conference.short_title) + = link_to 'Audience', admin_conference_program_difficulty_levels_path(@conference.short_title) - if can? :update, @conference.program.schedules.build %li{class: active_nav_li(admin_conference_schedules_path(@conference.short_title))} = link_to 'Schedules', admin_conference_schedules_path(@conference.short_title) diff --git a/app/views/proposals/_form.html.haml b/app/views/proposals/_form.html.haml index 71feac07..8082dee8 100644 --- a/app/views/proposals/_form.html.haml +++ b/app/views/proposals/_form.html.haml @@ -37,7 +37,7 @@ = f.select :language, @program.languages_list, { include_blank: false}, { class: 'select-help-toggle form-control' } - if display_details - if @conference.program.difficulty_levels.any? - = f.label :difficulty_level + = f.label :difficulty_level, 'Audience' = f.select :difficulty_level_id, @conference.program.difficulty_levels.map{|level| [level.title, level.id ] }, {include_blank: false}, { class: 'select-help-toggle form-control' } = render 'shared/select_help_text', f: f, for: :difficulty_level_id, options: @conference.program.difficulty_levels do |difficulty_level| = difficulty_level.description diff --git a/app/views/proposals/_tooltip.html.haml b/app/views/proposals/_tooltip.html.haml index 13f3155c..d5139ea1 100644 --- a/app/views/proposals/_tooltip.html.haml +++ b/app/views/proposals/_tooltip.html.haml @@ -27,4 +27,4 @@ = link_to 'Add a track', edit_conference_program_proposal_path(event.program.conference.short_title, event) %li{'class'=>class_for_todo(progress_status['difficulty_level'])} %span{'class'=>icon_for_todo(progress_status['difficulty_level'])} - = link_to 'Add a difficulty level', edit_conference_program_proposal_path(event.program.conference.short_title, event) + = link_to 'Add an Audience', edit_conference_program_proposal_path(event.program.conference.short_title, event) diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml index fa2e2f10..2944adb1 100644 --- a/app/views/proposals/show.html.haml +++ b/app/views/proposals/show.html.haml @@ -73,7 +73,7 @@ %dl#proposal-info .col-md-12 %dt Date: - %dd= @event_schedule.start_time.strftime("%Y %B %e - %H:%M") if @event_schedule + %dd= @event_schedule.start_time.strftime("%Y %B %e - %-I:%M %p") if @event_schedule .col-md-12 %dt Duration: %dd= show_time(@event.event_type.length) @@ -95,7 +95,7 @@ %span.label{style: "background-color: #{@event.track.color}; color: #{ contrast_color(@event.track.color) }"} = @event.track.name .col-md-12 - %dt Difficulty: + %dt Audience: %dd - if @event.difficulty_level %span.label{style: "background-color: #{@event.difficulty_level.color}; color: #{ contrast_color(@event.difficulty_level.color) };"} @@ -118,7 +118,7 @@ %dl %dt Start Time: %dd - = event.program.selected_event_schedules.find { |es| es.event == event }.start_time.strftime("%Y %B %e %H:%M") + = event.program.selected_event_schedules.find { |es| es.event == event }.start_time.strftime("%Y %B %e %-I:%M %p") %br %dt Room: %dd diff --git a/app/views/schedules/_carousel.html.haml b/app/views/schedules/_carousel.html.haml index 785a0681..0df40a41 100644 --- a/app/views/schedules/_carousel.html.haml +++ b/app/views/schedules/_carousel.html.haml @@ -17,9 +17,7 @@ - interval_count.times do %th.date %span - = (td_start_time).strftime("%H:") - %span - = (td_start_time).strftime("%M") + = (td_start_time).strftime("%-I:%M %p") - td_start_time += @step_minutes - start_room_time = start_time - @rooms.each do |room| diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml index 25f4e1a0..41f9548a 100644 --- a/app/views/schedules/_event.html.haml +++ b/app/views/schedules/_event.html.haml @@ -24,9 +24,9 @@ %span.track %span.fa-solid.fa-clock %span.label{ style: "background-color: grey" } - = event_schedule.start_time.strftime('%H:%M') + = event_schedule.start_time.strftime('%-I:%M %p') \- - = event_schedule.end_time.strftime('%H:%M') + = event_schedule.end_time.strftime('%-I:%M %p') %span.track %span.fa-solid.fa-location-dot %span.label{ style: "background-color: grey" } diff --git a/app/views/schedules/events.html.haml b/app/views/schedules/events.html.haml index b6e87e31..7b16a99f 100644 --- a/app/views/schedules/events.html.haml +++ b/app/views/schedules/events.html.haml @@ -21,7 +21,6 @@ / scheduled events - date = nil - - time = nil - @events_schedules.each do |event_schedule| - unless event_schedule.start_time.strftime('%Y-%m-%d').eql?(date) .col-xs-12.col-md-12 @@ -30,15 +29,11 @@ = date = event_schedule.start_time.strftime('%Y-%m-%d') %a{ title: "Go up", class: "pull-right", href: "#program" } %i{ class: "fa-solid fa-angles-up fa-lg", 'aria-hidden' => true } - - unless event_schedule.start_time.strftime('%H:%M').eql?(time) - .col-xs-12.col-md-1 - .start-time - = time = event_schedule.start_time.strftime('%H:%M') - .col-xs-12.col-md-11 - .new-time-event - = render partial: 'event', locals: { event: event_schedule.event, event_schedule: event_schedule } - - else - .col-xs-12.col-md-11.col-md-offset-1 + .col-xs-12.col-md-1 + .start-time + = event_schedule.start_time.strftime('%-I:%M %p') + .col-xs-12.col-md-11 + .new-time-event = render partial: 'event', locals: { event: event_schedule.event, event_schedule: event_schedule } / confirmed events that are not scheduled diff --git a/bin/bundle b/bin/bundle old mode 100755 new mode 100644 diff --git a/bin/bundle_report b/bin/bundle_report old mode 100755 new mode 100644 diff --git a/bin/delayed_job b/bin/delayed_job old mode 100755 new mode 100644 diff --git a/bin/deprecations b/bin/deprecations old mode 100755 new mode 100644 diff --git a/bin/gem-next-diff b/bin/gem-next-diff old mode 100755 new mode 100644 diff --git a/bin/next b/bin/next old mode 100755 new mode 100644 diff --git a/bin/rails b/bin/rails old mode 100755 new mode 100644 diff --git a/bin/rake b/bin/rake old mode 100755 new mode 100644 diff --git a/bin/rspec b/bin/rspec old mode 100755 new mode 100644 diff --git a/config/initializers/time_formats.rb b/config/initializers/time_formats.rb index 575b44ae..41eeb416 100644 --- a/config/initializers/time_formats.rb +++ b/config/initializers/time_formats.rb @@ -1 +1 @@ -Time::DATE_FORMATS[:db_without_seconds] = '%Y-%m-%d %l:%M %p' +Time::DATE_FORMATS[:db_without_seconds] = '%Y-%m-%d %H:%M' diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb old mode 100755 new mode 100644