Skip to content

Commit

Permalink
Upgrade to rails 7.1 (#218)
Browse files Browse the repository at this point in the history 
* Upgrade to Rails 7.1
* Fix test for committee members page
* Add linux and ruby to Platform support
* Update API version for mail tests
* Update .gitignore
* Update createsend gem
* Create credentials.yml.enc
* Update tailwind.config.js

---------

Co-authored-by: Pat Allan <[email protected]>
  • Loading branch information
@leesheppard @pat
leesheppard and pat authored Dec 17, 2023
1 parent 27fa3c1 commit e4d351b
Show file tree
Hide file tree
Showing 37 changed files with 618 additions and 315 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ yarn-debug.log*

# Ignore any local gitignore files
.gitignore_local

/config/master.key
1 change: 1 addition & 0 deletions .rubocop.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ AllCops:
- 'node_modules/**/*'
DisplayCopNames: true
TargetRubyVersion: 3.0
NewCops: disable

Layout/LineLength:
Enabled: false
Expand Down
5 changes: 3 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ source 'https://rubygems.org'

ruby '3.2.2'

gem 'rails', '~> 6.1.7'
gem 'rails', '~> 7.0'
gem 'pg'
gem 'puma'

gem 'bcrypt'
gem 'bugsnag'
gem 'createsend', '~> 5.1.1'
gem 'createsend'
gem 'decent_exposure'
gem 'devise'
gem 'icalendar'
Expand All @@ -22,6 +22,7 @@ gem 'sassc'
gem 'validates_email_format_of'
gem 'warden' # use for auth
gem 'webpacker', '6.0.0.rc.6'
gem 'sprockets-rails' # as of Rails 7.0, this is optional

group :production do
gem 'rails_12factor'
Expand Down
187 changes: 117 additions & 70 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,69 +11,86 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
actioncable (7.1.2)
actionpack (= 7.1.2)
activesupport (= 7.1.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
zeitwerk (~> 2.6)
actionmailbox (7.1.2)
actionpack (= 7.1.2)
activejob (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
mail (>= 2.7.1)
actionmailer (6.1.7.6)
actionpack (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activesupport (= 6.1.7.6)
net-imap
net-pop
net-smtp
actionmailer (7.1.2)
actionpack (= 7.1.2)
actionview (= 7.1.2)
activejob (= 7.1.2)
activesupport (= 7.1.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.6)
actionview (= 6.1.7.6)
activesupport (= 6.1.7.6)
rack (~> 2.0, >= 2.0.9)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
actionpack (7.1.2)
actionview (= 7.1.2)
activesupport (= 7.1.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.6)
actionpack (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.2)
actionpack (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (6.1.7.6)
activesupport (= 6.1.7.6)
actionview (7.1.2)
activesupport (= 7.1.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.6)
activesupport (= 6.1.7.6)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.2)
activesupport (= 7.1.2)
globalid (>= 0.3.6)
activemodel (6.1.7.6)
activesupport (= 6.1.7.6)
activerecord (6.1.7.6)
activemodel (= 6.1.7.6)
activesupport (= 6.1.7.6)
activestorage (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activesupport (= 6.1.7.6)
activemodel (7.1.2)
activesupport (= 7.1.2)
activerecord (7.1.2)
activemodel (= 7.1.2)
activesupport (= 7.1.2)
timeout (>= 0.4.0)
activestorage (7.1.2)
actionpack (= 7.1.2)
activejob (= 7.1.2)
activerecord (= 7.1.2)
activesupport (= 7.1.2)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.6)
activesupport (7.1.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
base64 (0.2.0)
bcrypt (3.1.20)
bigdecimal (3.1.5)
bindex (0.8.1)
bugsnag (6.26.0)
concurrent-ruby (~> 1.0)
Expand All @@ -92,10 +109,11 @@ GEM
simplecov
coderay (1.1.3)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
crack (0.4.5)
rexml
crass (1.0.6)
createsend (5.1.1)
createsend (6.1.0)
hashie (~> 3.0)
httparty (~> 0.14)
json (>= 1.0)
Expand All @@ -112,6 +130,8 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.5.0)
docile (1.4.0)
drb (2.2.0)
ruby2_keywords
erubi (1.12.0)
factory_bot (6.4.2)
activesupport (>= 5.0.0)
Expand Down Expand Up @@ -150,6 +170,10 @@ GEM
inline_svg (1.9.0)
activesupport (>= 3.0)
nokogiri (>= 1.6)
io-console (0.7.0)
irb (1.10.1)
rdoc
reline (>= 0.3.8)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
Expand Down Expand Up @@ -190,6 +214,7 @@ GEM
mini_portile2 (2.8.5)
minitest (5.20.0)
multi_xml (0.6.0)
mutex_m (0.2.0)
nenv (0.3.0)
net-imap (0.4.8)
date
Expand All @@ -204,6 +229,10 @@ GEM
nokogiri (1.15.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.5-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-linux)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
Expand All @@ -229,31 +258,37 @@ GEM
pry (>= 0.13, < 0.15)
pry-rails (0.3.9)
pry (>= 0.10.4)
psych (5.1.1.1)
stringio
public_suffix (5.0.4)
puma (6.4.0)
nio4r (~> 2.0)
pygmentize (0.0.3)
racc (1.7.3)
rack (2.2.8)
rack (3.0.8)
rack-proxy (0.7.7)
rack
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.6)
actioncable (= 6.1.7.6)
actionmailbox (= 6.1.7.6)
actionmailer (= 6.1.7.6)
actionpack (= 6.1.7.6)
actiontext (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activemodel (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.2)
actioncable (= 7.1.2)
actionmailbox (= 7.1.2)
actionmailer (= 7.1.2)
actionpack (= 7.1.2)
actiontext (= 7.1.2)
actionview (= 7.1.2)
activejob (= 7.1.2)
activemodel (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
bundler (>= 1.15.0)
railties (= 6.1.7.6)
sprockets-rails (>= 2.0.0)
railties (= 7.1.2)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -270,19 +305,25 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
method_source
railties (7.1.2)
actionpack (= 7.1.2)
activesupport (= 7.1.2)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.6.1)
psych (>= 4.0.0)
redcarpet (3.6.0)
regexp_parser (2.8.3)
reline (0.4.1)
io-console (~> 0.5)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
Expand Down Expand Up @@ -330,6 +371,7 @@ GEM
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
sassc (2.4.0)
ffi (~> 1.9)
semantic_range (3.0.0)
Expand All @@ -353,6 +395,7 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
stringio (3.1.0)
thor (1.3.0)
timeout (0.4.1)
tzinfo (2.0.6)
Expand All @@ -376,6 +419,7 @@ GEM
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
webrick (1.8.1)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -384,7 +428,9 @@ GEM
zeitwerk (2.6.12)

PLATFORMS
arm64-darwin-22
ruby
x86_64-linux

DEPENDENCIES
bcrypt
Expand All @@ -393,7 +439,7 @@ DEPENDENCIES
capybara
capybara-email!
codeclimate-test-reporter
createsend (~> 5.1.1)
createsend
decent_exposure
devise
factory_bot_rails
Expand All @@ -411,7 +457,7 @@ DEPENDENCIES
pry-rails
puma
pygmentize
rails (~> 6.1.7)
rails (~> 7.0)
rails-controller-testing
rails_12factor
redcarpet
Expand All @@ -424,6 +470,7 @@ DEPENDENCIES
spring
spring-commands-rspec
spring-watcher-listen
sprockets-rails
tzinfo-data
validates_email_format_of
warden
Expand All @@ -435,4 +482,4 @@ RUBY VERSION
ruby 3.2.2p53

BUNDLED WITH
2.4.21
2.5.1
4 changes: 4 additions & 0 deletions app/lib/mailing_list.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ def self.all
@all ||= LISTS.collect { |name| new name }
end

def self.each(...)
all.each(...)
end

def initialize(name)
@name = name
end
Expand Down
2 changes: 1 addition & 1 deletion app/lib/mailing_list/create_webhooks.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

class MailingList::CreateWebhooks
def self.call
MailingList.all.each do |list|
MailingList.each do |list|
new(list).call
end
end
Expand Down
Loading

0 comments on commit e4d351b

Please sign in to comment.