Skip to content

Commit

Permalink
Merge branch 'main' into 5070-update-banner-creation-ux
Browse files Browse the repository at this point in the history
  • Loading branch information
@carrollsa
carrollsa committed Aug 24, 2023
2 parents 3c89095 + 55dedff commit a95dcc5
Show file tree
Hide file tree
Showing 8 changed files with 397 additions and 591 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/flaky_test.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Flaky tests are defined as tests that return both passes and failures despite no
Fix the test so it runs consistently.

### CI Workflow
rspec or docker?
rspec or rspec in docker?

### Sample Error Output:
```
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/remove-helped-wanted.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Remove Help Wanted Label on Issue Assignment

on:
issues:
types: [assigned]

jobs:
automate-issues-labels:
runs-on: ubuntu-latest
steps:
- uses: andymckay/labeler@master
with:
remove-labels: "Help Wanted"
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

ruby "3.2.2"
gem "rails", "~> 7.0.5"
gem "rails", "~> 7.0.7"

gem "after_party" # post-deployment tasks
gem "amazing_print" # easier console reading
Expand Down Expand Up @@ -35,7 +35,7 @@ gem "pdf-forms" # filling in fund request PDFs with user input
gem "rexml" # pdf-forms needs this to deploy to heroku apparently
gem "pg" # Use postgresql as the database for Active Record
gem "pretender"
gem "puma", "6.3.0" # 6.2.2 fails to install on m1 # Use Puma as the app server
gem "puma", "6.3.1" # 6.2.2 fails to install on m1 # Use Puma as the app server
gem "pundit" # for authorization management - based on user.role field
gem "rack-attack" # for blocking & throttling abusive requests
gem "request_store"
Expand Down
134 changes: 67 additions & 67 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.6)
actionpack (= 7.0.6)
activesupport (= 7.0.6)
actioncable (7.0.7)
actionpack (= 7.0.7)
activesupport (= 7.0.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.6)
actionpack (= 7.0.6)
activejob (= 7.0.6)
activerecord (= 7.0.6)
activestorage (= 7.0.6)
activesupport (= 7.0.6)
actionmailbox (7.0.7)
actionpack (= 7.0.7)
activejob (= 7.0.7)
activerecord (= 7.0.7)
activestorage (= 7.0.7)
activesupport (= 7.0.7)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.6)
actionpack (= 7.0.6)
actionview (= 7.0.6)
activejob (= 7.0.6)
activesupport (= 7.0.6)
actionmailer (7.0.7)
actionpack (= 7.0.7)
actionview (= 7.0.7)
activejob (= 7.0.7)
activesupport (= 7.0.7)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.6)
actionview (= 7.0.6)
activesupport (= 7.0.6)
actionpack (7.0.7)
actionview (= 7.0.7)
activesupport (= 7.0.7)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.6)
actionpack (= 7.0.6)
activerecord (= 7.0.6)
activestorage (= 7.0.6)
activesupport (= 7.0.6)
actiontext (7.0.7)
actionpack (= 7.0.7)
activerecord (= 7.0.7)
activestorage (= 7.0.7)
activesupport (= 7.0.7)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.6)
activesupport (= 7.0.6)
actionview (7.0.7)
activesupport (= 7.0.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.6)
activesupport (= 7.0.6)
activejob (7.0.7)
activesupport (= 7.0.7)
globalid (>= 0.3.6)
activemodel (7.0.6)
activesupport (= 7.0.6)
activemodel (7.0.7)
activesupport (= 7.0.7)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (7.0.6)
activemodel (= 7.0.6)
activesupport (= 7.0.6)
activestorage (7.0.6)
actionpack (= 7.0.6)
activejob (= 7.0.6)
activerecord (= 7.0.6)
activesupport (= 7.0.6)
activerecord (7.0.7)
activemodel (= 7.0.7)
activesupport (= 7.0.7)
activestorage (7.0.7)
actionpack (= 7.0.7)
activejob (= 7.0.7)
activerecord (= 7.0.7)
activesupport (= 7.0.7)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.6)
activesupport (7.0.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -185,7 +185,7 @@ GEM
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (3.2.0)
faker (3.2.1)
i18n (>= 1.8.11, < 2)
faraday (1.10.3)
faraday-em_http (~> 1.0)
Expand Down Expand Up @@ -269,7 +269,7 @@ GEM
matrix (0.4.2)
method_source (1.0.0)
mini_magick (4.11.0)
mini_mime (1.1.2)
mini_mime (1.1.5)
minitest (5.19.0)
multi_xml (0.6.0)
multipart-post (2.3.0)
Expand All @@ -285,11 +285,11 @@ GEM
net-smtp (0.3.3)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.3-arm64-darwin)
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.3-x86_64-darwin)
nokogiri (1.15.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.3-x86_64-linux)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
noticed (1.6.3)
http (>= 4.0.0)
Expand All @@ -313,7 +313,7 @@ GEM
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
public_suffix (5.0.1)
puma (6.3.0)
puma (6.3.1)
nio4r (~> 2.0)
pundit (2.3.1)
activesupport (>= 3.0.0)
Expand All @@ -323,34 +323,34 @@ GEM
rack (>= 1.0, < 4)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.6)
actioncable (= 7.0.6)
actionmailbox (= 7.0.6)
actionmailer (= 7.0.6)
actionpack (= 7.0.6)
actiontext (= 7.0.6)
actionview (= 7.0.6)
activejob (= 7.0.6)
activemodel (= 7.0.6)
activerecord (= 7.0.6)
activestorage (= 7.0.6)
activesupport (= 7.0.6)
rails (7.0.7)
actioncable (= 7.0.7)
actionmailbox (= 7.0.7)
actionmailer (= 7.0.7)
actionpack (= 7.0.7)
actiontext (= 7.0.7)
actionview (= 7.0.7)
activejob (= 7.0.7)
activemodel (= 7.0.7)
activerecord (= 7.0.7)
activestorage (= 7.0.7)
activesupport (= 7.0.7)
bundler (>= 1.15.0)
railties (= 7.0.6)
railties (= 7.0.7)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.1.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.6)
actionpack (= 7.0.6)
activesupport (= 7.0.6)
railties (7.0.7)
actionpack (= 7.0.7)
activesupport (= 7.0.7)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -432,15 +432,15 @@ GEM
standard (1.5.0)
rubocop (= 1.23.0)
rubocop-performance (= 1.12.0)
stimulus-rails (1.2.1)
stimulus-rails (1.2.2)
railties (>= 6.0.0)
strong_migrations (1.6.0)
strong_migrations (1.6.1)
activerecord (>= 5.2)
thor (1.2.2)
timeout (0.4.0)
traceroute (0.8.1)
rails (>= 3.0.0)
twilio-ruby (6.3.1)
twilio-ruby (6.4.0)
faraday (>= 0.9, < 3.0)
jwt (>= 1.5, < 3.0)
nokogiri (>= 1.6, < 2.0)
Expand All @@ -467,12 +467,12 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket (1.2.9)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.10)
zeitwerk (2.6.11)

PLATFORMS
arm64-darwin-20
Expand Down Expand Up @@ -528,10 +528,10 @@ DEPENDENCIES
pretender
pry
pry-byebug
puma (= 6.3.0)
puma (= 6.3.1)
pundit
rack-attack
rails (~> 7.0.5)
rails (~> 7.0.7)
rails-controller-testing
rake
request_store
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ en:
description: Volunteer activity tracking for CASA volunteers, supervisors, and administrators.
time:
formats:
day_and_date: "%A, %v"
day_and_date: "%A, %d-%b-%Y"
standard: "%m-%d-%Y"
contact_occurred_at: "%Y%m%d%H%M%s"
full: "%B %-d, %Y"
Expand Down
18 changes: 9 additions & 9 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"build:css:dev": "sass app/assets/stylesheets/application.scss app/assets/builds/application.css --load-path=node_modules --watch"
},
"dependencies": {
"@babel/core": "^7.0.0",
"@fortawesome/fontawesome-free": "^6.4.0",
"@hotwired/stimulus": "^3.2.1",
"@babel/core": "^7.22.10",
"@fortawesome/fontawesome-free": "^6.4.2",
"@hotwired/stimulus": "^3.2.2",
"@popperjs/core": "^2.11.8",
"@rails/actioncable": "^7.0.6",
"@rails/actiontext": "^7.0.6",
"@rails/activestorage": "^7.0.6",
"@rails/ujs": "^7.0.6",
"@rails/activestorage": "^7.0.7",
"@rails/ujs": "^7.0.7",
"add2calendar": "^1.1.8",
"bindings": "^1.5.0",
"bootstrap": "5.3.1",
Expand All @@ -29,15 +29,15 @@
"chart.js": "^4.3.3",
"chartjs-adapter-luxon": "^1.3.1",
"datatables.net-dt": "^1.13.6",
"esbuild": "^0.18.17",
"esbuild": "^0.19.2",
"faker": "^5.5.3",
"jquery": "^3.6.4",
"js-cookie": "^3.0.5",
"jstz": "^2.1.1",
"lodash": "^4.17.21",
"luxon": "^3.3.0",
"luxon": "^3.4.0",
"popper.js": "^1.16.1",
"sass": "^1.64.2",
"sass": "^1.65.1",
"select2": "^4.0.13",
"select2-bootstrap-5-theme": "^1.3.0",
"stimulus-rails-nested-form": "^4.1.0",
Expand All @@ -49,7 +49,7 @@
},
"version": "0.1.0",
"devDependencies": {
"@babel/preset-env": "^7.22.9",
"@babel/preset-env": "^7.22.10",
"jest": "^29.6.2",
"jest-environment-jsdom": "^29.6.2",
"markdown-toc": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion spec/system/casa_cases/show_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

it "can see next court date", js: true do
expect(page).to have_content(
"Next Court Date: #{I18n.l(future_court_date.date, format: "%A, %-d-%^b-%Y")}"
"Next Court Date: #{I18n.l(future_court_date.date, format: :day_and_date)}"
)
end

Expand Down
Loading

0 comments on commit a95dcc5

Please sign in to comment.