From 8637dbbb45713f44db89946e84f4d874ac6eafdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Mar 2025 14:09:14 -0400 Subject: [PATCH 01/13] Bump rexml from 3.3.7 to 3.3.9 (#572) * Bump msgpack version from 1.4.4 to 1.4.5 to fix install issues (#565) * Bump rexml from 3.3.7 to 3.3.9 Bumps [rexml](https://github.com/ruby/rexml) from 3.3.7 to 3.3.9. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.7...v3.3.9) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: TBG <43731728+Runner-dev@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6d2356c2..2505f249 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -247,7 +247,7 @@ GEM responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) - rexml (3.3.7) + rexml (3.3.9) riddle (2.4.3) ruby-rc4 (0.1.5) ruby-saml (1.17.0) From 6bd8bbbedad89613d362e26e61bbd39bb05908c0 Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Fri, 21 Mar 2025 15:15:26 -0400 Subject: [PATCH 02/13] ruby 3.1, update grover --- .ruby-version | 2 +- Gemfile.lock | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.ruby-version b/.ruby-version index 2451c27c..9cec7165 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.7 +3.1.6 diff --git a/Gemfile.lock b/Gemfile.lock index 2505f249..0be0eca3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,9 +74,6 @@ GEM msgpack (~> 1.2) builder (3.2.4) cancancan (3.3.0) - combine_pdf (1.0.22) - matrix - ruby-rc4 (>= 0.1.5) concurrent-ruby (1.1.10) crass (1.0.6) date (3.3.4) @@ -123,9 +120,8 @@ GEM activesupport (>= 5.0) gmail_xoauth (0.4.3) oauth (>= 0.3.6) - grover (1.1.0) - combine_pdf (~> 1.0) - nokogiri (~> 1.0) + grover (1.2.3) + nokogiri (~> 1) hashie (5.0.0) i18n (1.12.0) concurrent-ruby (~> 1.0) @@ -151,7 +147,6 @@ GEM net-pop net-smtp marcel (1.0.2) - matrix (0.4.2) method_source (1.0.0) middleware (0.1.0) mini_mime (1.1.5) @@ -249,7 +244,6 @@ GEM railties (>= 5.0) rexml (3.3.9) riddle (2.4.3) - ruby-rc4 (0.1.5) ruby-saml (1.17.0) nokogiri (>= 1.13.10) rexml @@ -361,7 +355,7 @@ DEPENDENCIES will_paginate RUBY VERSION - ruby 3.0.7p220 + ruby 3.1.6p260 BUNDLED WITH 2.5.21 From 21d815359f38d969b7094b8e56e0e12e6ed9cc63 Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Fri, 21 Mar 2025 15:29:35 -0400 Subject: [PATCH 03/13] update rack, omnniauth, omniauth-saml, and ruby-saml --- Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0be0eca3..c69ece97 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -150,7 +150,7 @@ GEM method_source (1.0.0) middleware (0.1.0) mini_mime (1.1.5) - mini_portile2 (2.8.7) + mini_portile2 (2.8.8) minitest (5.17.0) msgpack (1.4.5) multi_json (1.15.0) @@ -167,7 +167,7 @@ GEM net-smtp (0.4.0.1) net-protocol nio4r (2.7.3) - nokogiri (1.16.7) + nokogiri (1.18.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth (1.1.0) @@ -182,21 +182,21 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (2.1.2) + omniauth (2.1.3) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection omniauth-rails_csrf_protection (1.0.0) actionpack (>= 4.2) omniauth (~> 2.0) - omniauth-saml (2.1.2) + omniauth-saml (2.2.3) omniauth (~> 2.1) - ruby-saml (~> 1.17) + ruby-saml (~> 1.18) orm_adapter (0.5.0) puma (5.6.9) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.9) + rack (2.2.13) rack-cors (1.1.1) rack (>= 2.0.0) rack-protection (3.2.0) @@ -242,9 +242,9 @@ GEM responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) - rexml (3.3.9) + rexml (3.4.1) riddle (2.4.3) - ruby-saml (1.17.0) + ruby-saml (1.18.0) nokogiri (>= 1.13.10) rexml ruby2_keywords (0.0.5) From 67f1b2e083113a52e851a97cabb4d9a29b029979 Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Fri, 21 Mar 2025 15:32:32 -0400 Subject: [PATCH 04/13] update net-imap --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c69ece97..cc322dc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,7 @@ GEM cancancan (3.3.0) concurrent-ruby (1.1.10) crass (1.0.6) - date (3.3.4) + date (3.4.1) devise (4.8.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -157,7 +157,7 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) mysql2 (0.5.4) - net-imap (0.4.10) + net-imap (0.4.19) date net-protocol net-pop (0.1.2) @@ -291,7 +291,7 @@ GEM riddle (~> 2.3) thor (1.2.1) tilt (2.0.10) - timeout (0.4.1) + timeout (0.4.3) tzinfo (2.0.5) concurrent-ruby (~> 1.0) uglifier (4.2.0) From 558be10052a5a6076e1a0436f319c321af1a98ed Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Mon, 24 Mar 2025 16:42:00 -0400 Subject: [PATCH 05/13] fix undocumented and removed Time months constant to use documented Date constant --- app/helpers/events_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index f4a8fa44..217caee3 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -65,7 +65,7 @@ def month_links(cur=nil,count=nil) if now_mon < 6 now_year -= 1 end - months = Time::RFC2822_MONTH_NAME + months = (Date::ABBR_MONTHNAMES).drop(1) month_links = [] indices = [(6..12).to_a, (1..5).to_a] indices.each do |is| From 9ee4a7f4f13a487f0d4ccc72ec9825148ed08863 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 18:37:44 -0400 Subject: [PATCH 06/13] Bump nokogiri from 1.18.5 to 1.18.8 (#589) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.5 to 1.18.8. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.18.5...v1.18.8) --- updated-dependencies: - dependency-name: nokogiri dependency-version: 1.18.8 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cc322dc4..0553b466 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -167,7 +167,7 @@ GEM net-smtp (0.4.0.1) net-protocol nio4r (2.7.3) - nokogiri (1.18.5) + nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth (1.1.0) From 32de2ac15e3da46e6c532e359f050fe31ee9820a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 18:38:28 -0400 Subject: [PATCH 07/13] Bump net-imap from 0.4.19 to 0.4.20 (#588) Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.19 to 0.4.20. - [Release notes](https://github.com/ruby/net-imap/releases) - [Commits](https://github.com/ruby/net-imap/compare/v0.4.19...v0.4.20) --- updated-dependencies: - dependency-name: net-imap dependency-version: 0.4.20 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d6bc6b0e..fa1253ee 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ gem 'will_paginate' gem 'rails_autolink' gem 'icalendar' gem 'mail' -gem "net-imap", "~> 0.4.10" # explicit since used for email:idle even though dep of 'mail' +gem "net-imap", "~> 0.4.20" # explicit since used for email:idle even though dep of 'mail' gem 'devise' gem 'devise-encryptable' gem 'enumerize' diff --git a/Gemfile.lock b/Gemfile.lock index 0553b466..b837c893 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -157,7 +157,7 @@ GEM multi_xml (0.6.0) multipart-post (2.1.1) mysql2 (0.5.4) - net-imap (0.4.19) + net-imap (0.4.20) date net-protocol net-pop (0.1.2) @@ -333,7 +333,7 @@ DEPENDENCIES jquery-ui-rails mail mysql2 (~> 0.5.4) - net-imap (~> 0.4.10) + net-imap (~> 0.4.20) oauth2 omniauth omniauth-rails_csrf_protection From c34e173d1bffc24f6e7a64a84a41bdf6d14c487c Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Wed, 7 May 2025 18:56:26 -0400 Subject: [PATCH 08/13] update rails 6.1.7.10 --- Gemfile | 2 +- Gemfile.lock | 170 +++++++++++++++++++++++++------------------------ config/boot.rb | 5 ++ 3 files changed, 93 insertions(+), 84 deletions(-) diff --git a/Gemfile b/Gemfile index fa1253ee..f68fed18 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby File.read(".ruby-version").strip # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.1.7.1' +gem 'rails', '~> 6.1.7.10' # Use mysql as the database for Active Record gem 'mysql2', '~> 0.5.4' diff --git a/Gemfile.lock b/Gemfile.lock index b837c893..31a59068 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,40 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.1) - actionpack (= 6.1.7.1) - activesupport (= 6.1.7.1) + actioncable (6.1.7.10) + actionpack (= 6.1.7.10) + activesupport (= 6.1.7.10) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.1) - actionpack (= 6.1.7.1) - activejob (= 6.1.7.1) - activerecord (= 6.1.7.1) - activestorage (= 6.1.7.1) - activesupport (= 6.1.7.1) + actionmailbox (6.1.7.10) + actionpack (= 6.1.7.10) + activejob (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) mail (>= 2.7.1) - actionmailer (6.1.7.1) - actionpack (= 6.1.7.1) - actionview (= 6.1.7.1) - activejob (= 6.1.7.1) - activesupport (= 6.1.7.1) + actionmailer (6.1.7.10) + actionpack (= 6.1.7.10) + actionview (= 6.1.7.10) + activejob (= 6.1.7.10) + activesupport (= 6.1.7.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.1) - actionview (= 6.1.7.1) - activesupport (= 6.1.7.1) + actionpack (6.1.7.10) + actionview (= 6.1.7.10) + activesupport (= 6.1.7.10) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.1) - actionpack (= 6.1.7.1) - activerecord (= 6.1.7.1) - activestorage (= 6.1.7.1) - activesupport (= 6.1.7.1) + actiontext (6.1.7.10) + actionpack (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) nokogiri (>= 1.8.5) - actionview (6.1.7.1) - activesupport (= 6.1.7.1) + actionview (6.1.7.10) + activesupport (= 6.1.7.10) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -44,22 +44,22 @@ GEM activemodel (>= 5.2.0) activestorage (>= 5.2.0) activesupport (>= 5.2.0) - activejob (6.1.7.1) - activesupport (= 6.1.7.1) + activejob (6.1.7.10) + activesupport (= 6.1.7.10) globalid (>= 0.3.6) - activemodel (6.1.7.1) - activesupport (= 6.1.7.1) - activerecord (6.1.7.1) - activemodel (= 6.1.7.1) - activesupport (= 6.1.7.1) - activestorage (6.1.7.1) - actionpack (= 6.1.7.1) - activejob (= 6.1.7.1) - activerecord (= 6.1.7.1) - activesupport (= 6.1.7.1) + activemodel (6.1.7.10) + activesupport (= 6.1.7.10) + activerecord (6.1.7.10) + activemodel (= 6.1.7.10) + activesupport (= 6.1.7.10) + activestorage (6.1.7.10) + actionpack (= 6.1.7.10) + activejob (= 6.1.7.10) + activerecord (= 6.1.7.10) + activesupport (= 6.1.7.10) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.1) + activesupport (6.1.7.10) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -72,9 +72,9 @@ GEM bindex (0.8.1) bootsnap (1.10.2) msgpack (~> 1.2) - builder (3.2.4) + builder (3.3.0) cancancan (3.3.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.3.5) crass (1.0.6) date (3.4.1) devise (4.8.1) @@ -87,7 +87,7 @@ GEM devise (>= 2.1.0) enumerize (2.5.0) activesupport (>= 3.2) - erubi (1.12.0) + erubi (1.13.1) execjs (2.8.1) faraday (1.9.3) faraday-em_http (~> 1.0) @@ -116,14 +116,14 @@ GEM faraday (~> 1.0) ffi (1.15.4) gli (2.20.1) - globalid (1.0.1) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) gmail_xoauth (0.4.3) oauth (>= 0.3.6) grover (1.2.3) nokogiri (~> 1) hashie (5.0.0) - i18n (1.12.0) + i18n (1.14.7) concurrent-ruby (~> 1.0) icalendar (2.7.1) ice_cube (~> 0.16) @@ -138,35 +138,35 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) jwt (2.3.0) - loofah (2.19.1) + loofah (2.24.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - marcel (1.0.2) - method_source (1.0.0) + marcel (1.0.4) + method_source (1.1.0) middleware (0.1.0) mini_mime (1.1.5) mini_portile2 (2.8.8) - minitest (5.17.0) + minitest (5.25.5) msgpack (1.4.5) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) mysql2 (0.5.4) - net-imap (0.4.20) + net-imap (0.4.22) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.1) net-protocol - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) @@ -196,7 +196,7 @@ GEM puma (5.6.9) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.13) + rack (2.2.14) rack-cors (1.1.1) rack (>= 2.0.0) rack-protection (3.2.0) @@ -204,37 +204,39 @@ GEM rack (~> 2.2, >= 2.2.4) rack-proxy (0.7.2) rack - rack-test (2.0.2) + rack-test (2.2.0) rack (>= 1.3) - rails (6.1.7.1) - actioncable (= 6.1.7.1) - actionmailbox (= 6.1.7.1) - actionmailer (= 6.1.7.1) - actionpack (= 6.1.7.1) - actiontext (= 6.1.7.1) - actionview (= 6.1.7.1) - activejob (= 6.1.7.1) - activemodel (= 6.1.7.1) - activerecord (= 6.1.7.1) - activestorage (= 6.1.7.1) - activesupport (= 6.1.7.1) + rails (6.1.7.10) + actioncable (= 6.1.7.10) + actionmailbox (= 6.1.7.10) + actionmailer (= 6.1.7.10) + actionpack (= 6.1.7.10) + actiontext (= 6.1.7.10) + actionview (= 6.1.7.10) + activejob (= 6.1.7.10) + activemodel (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) bundler (>= 1.15.0) - railties (= 6.1.7.1) + railties (= 6.1.7.10) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.2) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) rails_autolink (1.1.6) rails (> 3.1) - railties (6.1.7.1) - actionpack (= 6.1.7.1) - activesupport (= 6.1.7.1) + railties (6.1.7.10) + actionpack (= 6.1.7.10) + activesupport (= 6.1.7.10) method_source rake (>= 12.2) thor (~> 1.0) - rake (13.0.6) + rake (13.2.1) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) @@ -275,12 +277,13 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - sprockets (3.7.2) + sprockets (3.7.5) + base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) thinking-sphinx (5.4.0) activerecord (>= 4.2.0) @@ -289,10 +292,10 @@ GEM joiner (>= 0.3.4) middleware (>= 0.1.0) riddle (~> 2.3) - thor (1.2.1) + thor (1.3.2) tilt (2.0.10) timeout (0.4.3) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -309,11 +312,12 @@ GEM rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - websocket-driver (0.7.5) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.1) - zeitwerk (2.6.6) + zeitwerk (2.6.18) PLATFORMS ruby @@ -340,7 +344,7 @@ DEPENDENCIES omniauth-saml puma rack-cors (~> 1.1) - rails (~> 6.1.7.1) + rails (~> 6.1.7.10) rails_autolink responders sanitize diff --git a/config/boot.rb b/config/boot.rb index 3cda23b4..6b891e77 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,4 +1,9 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) require "bundler/setup" # Set up gems listed in the Gemfile. + +# WORKAROUND Rails 6.1: +# https://stackoverflow.com/a/79379493 +require "logger" + require "bootsnap/setup" # Speed up boot time by caching expensive operations. From ca113a9b94b524ad89685042d9cc321fb66c5292 Mon Sep 17 00:00:00 2001 From: Tucker Shea Date: Mon, 18 Aug 2025 20:49:44 -0400 Subject: [PATCH 09/13] fix: update welcome email New year, new HoTs! --- app/views/join_request_mailer/join_request.html.erb | 2 +- app/views/join_request_mailer/join_request.text.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/join_request_mailer/join_request.html.erb b/app/views/join_request_mailer/join_request.html.erb index f593dc5d..e48efe05 100644 --- a/app/views/join_request_mailer/join_request.html.erb +++ b/app/views/join_request_mailer/join_request.html.erb @@ -73,7 +73,7 @@

Thanks, -
Heidi, Maggie, Max, and Wellington +
Mia, Vi, and Max
Heads of Tech

diff --git a/app/views/join_request_mailer/join_request.text.erb b/app/views/join_request_mailer/join_request.text.erb index 42f63537..a59a63d7 100644 --- a/app/views/join_request_mailer/join_request.text.erb +++ b/app/views/join_request_mailer/join_request.text.erb @@ -27,6 +27,6 @@ One last note: if you ever hear the song Sunchyme by Dario G playing anywhere on If you ever have any questions about anything, don't hesitate to email abtech@andrew.cmu.edu, and I or someone from our officer team will get back to you shortly. Thanks, -Heidi, Maggie, Max, and Wellington +Mia, Vi, and Max Heads of Tech From b51a947e5ee272ff8c82817ee658d3ac8660c67e Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Thu, 4 Sep 2025 11:22:58 -0400 Subject: [PATCH 10/13] add auto restart to email idle systemd unit --- deploy/systemd/abtech-tracker-email-idle@.service | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deploy/systemd/abtech-tracker-email-idle@.service b/deploy/systemd/abtech-tracker-email-idle@.service index af2fedd2..ef54cc8d 100644 --- a/deploy/systemd/abtech-tracker-email-idle@.service +++ b/deploy/systemd/abtech-tracker-email-idle@.service @@ -40,5 +40,11 @@ Type=simple ExecStart=/srv/abtech-tracker/%i/rbenv/shims/bundle exec --keep-file-descriptors rails email:idle +Restart=always +#RestartMode=normal +RestartSec=10s +#RestartSteps=6 +#RestartMaxDelaySec=30m + [Install] WantedBy=multi-user.target From 01c318e5c94d2fa8a3e7883ad77bd6295f566cc4 Mon Sep 17 00:00:00 2001 From: Tomas Goncalves <43731728+Runner-dev@users.noreply.github.com> Date: Mon, 22 Sep 2025 18:45:52 -0400 Subject: [PATCH 11/13] Feat: Change navbar link to point to active-only members --- app/views/layouts/application.html.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f0a375a2..69e98895 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,15 +21,15 @@
<%= image_tag "loader.gif" %>
- +
<% if Rails.env.development? %>
DEVELOPMENT
ENVIRONMENT
<% end %> - + <%= link_to image_tag("header.png"), root_url %>
- + <% if kiosk_signed_in? %>
KIOSK MODE
@@ -88,15 +88,15 @@ <%= conditional_link_to "Reference", reference_events_url, :index, Event %> <%= conditional_link_to "Email (#{Email.where(unread: true).count})", emails_url, :read, Email %> <%= conditional_link_to "Finance", invoices_url, :read, :finance %> - <%= conditional_link_to "Members", members_url, :index, Member %> + <%= conditional_link_to "Members", members_url(active_only: 1), :index, Member %> <%= conditional_link_to "Timecards", timecard_entries_url, :read, TimecardEntry %> <%= conditional_link_to "Weather", weather_index_url, :index, WeatherController %> <%= link_to "Radio Checkout", 'https://bit.ly/techradios', target: :_blank if can? :read, Event %> - + <% if member_signed_in? or kiosk_signed_in? %> <%= link_to "Miscellaneous", "#", class: "toggle-div", data: {div: "misc-menu"} %> - <% if show_admin_link %> + <% if show_admin_link %> <%= link_to "Tracker Admin", "#", class: "toggle-div", data: {div: "submenu"} %> <% end %> <% end %> @@ -107,7 +107,7 @@ <%= conditional_link_to "Organizations", organizations_url, :read, Organization %> <%= conditional_link_to "Attachments", attachments_url, :read, Attachment %>
- + <% if show_admin_link %>