Skip to content

Commit

Permalink
Merge branch 'main' into api
Browse files Browse the repository at this point in the history
  • Loading branch information
xihai01 authored Oct 16, 2023
2 parents 048c8e2 + 4d6ad53 commit 121c689
Show file tree
Hide file tree
Showing 139 changed files with 7,776 additions and 2,743 deletions.
4 changes: 4 additions & 0 deletions .allow_skipping_tests
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ controllers/learning_hour_types_controller.rb
controllers/mileage_reports_controller.rb
controllers/placements_controller.rb
controllers/users/sessions_controller.rb
controllers/learning_hour_topics_controller.rb
datatables/application_datatable.rb
decorators/application_decorator.rb
decorators/case_assignment_decorator.rb
decorators/court_date_decorator.rb
decorators/learning_hour_decorator.rb
decorators/learning_hour_topic_decorator.rb
helpers/all_casa_admins/casa_orgs_helper.rb
helpers/api_base_helper.rb
helpers/date_helper.rb
Expand All @@ -32,10 +34,12 @@ notifications/delivery_methods/sms.rb
notifications/emancipation_checklist_reminder_notification.rb
notifications/followup_notification.rb
notifications/followup_resolved_notification.rb
notifications/reimbursement_complete_notification.rb
notifications/youth_birthday_notification.rb
policies/fund_request_policy.rb
policies/learning_hour_policy.rb
policies/learning_hour_type_policy.rb
policies/learning_hour_topic_policy.rb
policies/note_policy.rb
presenters/base_presenter.rb
presenters/case_contact_presenter.rb
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
RAILS_ENV: test
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Create downloads folder
run: |
mkdir -p tmp/downloads
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/erb_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/factory_bot_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rake-after_party.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ruby_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spec_checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
spec_checker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yaml_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
lintAllTheThings:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: yaml-lint
uses: ibiqlik/action-yamllint@v3
2 changes: 1 addition & 1 deletion .github/workflows/yarn_lint_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
Expand Down
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
source "https://rubygems.org"

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

gem "after_party" # post-deployment tasks
gem "amazing_print" # easier console reading
gem "azure-storage-blob", require: false
gem "bugsnag" # tracking errors in prod
gem "caxlsx", "~> 3.4" # excel spreadsheets - TODO can we remove this version restriction?
gem "caxlsx_rails", "~> 0.6.3" # excel spreadsheets - TODO can we remove this version restriction?
gem "cssbundling-rails", "~> 1.2" # compiles css
gem "cssbundling-rails", "~> 1.3" # compiles css
gem "delayed_job_active_record"
gem "devise" # for authentication
gem "devise_invitable"
Expand All @@ -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.1" # 6.2.2 fails to install on m1 # Use Puma as the app server
gem "puma", "6.4.0" # 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 "rack-cors" # for allowing cross-origin resource sharing
Expand Down Expand Up @@ -81,6 +81,7 @@ group :test do
gem "capybara"
gem "capybara-screenshot"
gem "database_cleaner-active_record"
gem "email_spec"
gem "rails-controller-testing"
gem "rake"
gem "selenium-webdriver"
Expand Down
Loading

0 comments on commit 121c689

Please sign in to comment.