Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 75 #908

Open
wants to merge 11 commits into
base: release-74
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ icu-dev
imagemagick
lftp
libcurl
libffi-dev
libgcc
libintl
libmagic
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/asset_compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- gha_production_load_6

runs-on: ubuntu-22.04
container: ruby:3.1.6-alpine3.20
container: ruby:3.3.7-alpine3.20

steps:
- name: Checkout
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Install gems
if: always()
run: |
gem install bundler --version=2.5.17
gem install bundler --version=2.6.3
bundle config set --local without 'production staging development'
bundle install --jobs 10 --retry 3

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
audit:
runs-on: ubuntu-22.04
# Docker Hub image that the job executes in
container: ruby:3.1.6-alpine3.20
container: ruby:3.3.7-alpine3.20

steps:
- name: Checkout
Expand All @@ -25,7 +25,7 @@ jobs:

- name: 'Install gems'
run: |
gem install bundler --version=2.5.17
gem install bundler --version=2.6.3
bundle config set --local without 'production staging development'
bundle install --jobs 4 --retry 3

Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/build_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
trivy_skip_files: /app/config/key.pem,/app/docker/sftp/ssh_host_ed25519_key,/app/docker/sftp/ssh_host_rsa_key
target: prod-build
build-args: |
BUILD_TAG=3.1.6-alpine3.20
BUNDLER_VERSION=2.5.17
BUILD_TAG=3.3.7-alpine3.20
BUNDLER_VERSION=2.6.3
USER_ID=10000
GROUP_ID=10000
tags: |
Expand All @@ -51,6 +51,12 @@ jobs:
type=raw,event=branch,value=branch-{{branch}}-{{sha}}

steps:
- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Checkout
uses: actions/checkout@v4

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rails_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build:
runs-on: ubuntu-22.04
# Docker Hub image that the job executes in
container: ruby:3.1.6-alpine3.20
container: ruby:3.3.7-alpine3.20

# Service containers to run with job
services:
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:

- name: Install gems
run: |
gem install bundler --version=2.5.17
gem install bundler --version=2.6.3
bundle config set --local without 'production staging development'
bundle install --jobs 4 --retry 3

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-22.04

# Docker Hub image that the job executes in
container: ruby:3.1.6-alpine3.20
container: ruby:3.3.7-alpine3.20
steps:
- name: Install git
run: |
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
- id: gems
name: Install gems
run: |
gem install bundler --version=2.5.17
gem install bundler --version=2.6.3
bundle config set --local without 'production staging'
bundle install --jobs 4 --retry 3

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ docker-compose.override.yml
*.sublime-workspace

.env.local
.pgpass

# Ignore themes
app/assets/stylesheets/theme/styles
Expand Down
1 change: 0 additions & 1 deletion .irbrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'irb/ext/save-history'
IRB.conf[:SAVE_HISTORY] = 1_000
IRB.conf[:HISTORY_FILE] = File.join(__dir__, '.pry_history')
IRB.conf[:USE_AUTOCOMPLETE] = false
37 changes: 18 additions & 19 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ require:

AllCops:
Exclude:
- 'db/**/*'
- 'config/*'
- 'config/environments/**/*.rb'
- 'config/initializers/**/*.rb'
- 'config/locales/**/*.rb'
- 'script/**/*'
- 'bin/{rails,rake,bundle}'
- 'app/assets/**/*'
- 'bin/db_prep'
- "db/**/*"
- "config/*"
- "config/environments/**/*.rb"
- "config/initializers/**/*.rb"
- "config/locales/**/*.rb"
- "script/**/*"
- "bin/{rails,rake,bundle}"
- "app/assets/**/*"
- "bin/db_prep"

Include:
- '**/Rakefile'
- 'app/**/*.rb'
- 'spec/**/*.rb'
- 'drivers/**/*.rb'
- 'lib/**/*.rb'
- "**/Rakefile"
- "app/**/*.rb"
- "spec/**/*.rb"
- "drivers/**/*.rb"
- "lib/**/*.rb"

NewCops: disable

Expand Down Expand Up @@ -62,15 +62,14 @@ Style/PercentLiteralDelimiters:
PreferredDelimiters:
# Using `[]` for string arrays instead of `()`, since normal arrays are
# indicated with `[]` not `()`.
'%w': '[]'
'%W': '[]'
"%w": "[]"
"%W": "[]"

Style/AndOr:
Enabled: true

Style/ClassAndModuleChildren:
Enabled:
false
Enabled: false

Style/ConditionalAssignment:
Enabled: false
Expand All @@ -88,7 +87,7 @@ Style/RescueStandardError:
Enabled: true

Style/FrozenStringLiteralComment:
Enabled: false
Enabled: true

Style/CommentedKeyword:
Enabled: false
Expand Down
7 changes: 0 additions & 7 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ Layout/EmptyLineBetweenDefs:
# Cop supports --auto-correct.
Layout/EmptyLines:
Exclude:
- 'bin/setup'
- 'spec/factories/match_decisions/match_recommendation_shelter_agency.rb'
- 'spec/models/rules/interested_in_neighborhood_spec.rb'
- 'spec/models/rules/rank_below_spec.rb'
Expand Down Expand Up @@ -164,7 +163,6 @@ Layout/EmptyLinesAroundBlockBody:
- 'spec/models/rules/tagged_with_spec.rb'
- 'spec/models/rules/vispdat_scores_spec.rb'
- 'spec/models/user_spec.rb'
- 'spec/spec_helper.rb'
- 'spec/support/tasks.rb'
- 'spec/tasks/update_clients_spec.rb'

Expand Down Expand Up @@ -710,7 +708,6 @@ Style/Alias:
# Cop supports --auto-correct.
Style/BlockComments:
Exclude:
- 'spec/spec_helper.rb'

# Offense count: 61
# Cop supports --auto-correct.
Expand Down Expand Up @@ -797,7 +794,6 @@ Style/IfInsideElse:
# Cop supports --auto-correct.
Style/IfUnlessModifier:
Exclude:
- 'bin/setup'

# Offense count: 3
# Cop supports --auto-correct.
Expand Down Expand Up @@ -882,7 +878,6 @@ Style/ParenthesesAroundCondition:
# Configuration parameters: PreferredDelimiters.
Style/PercentLiteralDelimiters:
Exclude:
- 'bin/setup'

# Offense count: 90
# Cop supports --auto-correct.
Expand Down Expand Up @@ -983,7 +978,6 @@ Style/StringLiterals:
- 'bin/deploy'
- 'bin/guard'
- 'bin/rspec'
- 'bin/setup'
- 'bin/update'
- 'spec/controllers/account_emails_controller_spec.rb'
- 'spec/controllers/account_passwords_controller_spec.rb'
Expand Down Expand Up @@ -1034,7 +1028,6 @@ Style/TrailingCommaInArguments:
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
Style/TrailingCommaInArrayLiteral:
Exclude:
- 'bin/setup'

# Offense count: 21
# Cop supports --auto-correct.
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.1.6
ruby-3.3.7
35 changes: 20 additions & 15 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,29 @@
source 'https://rubygems.org'

gem 'activerecord-import'
gem 'rack', '>= 2.2.8.1'
gem 'rack', '>= 2.2.11'
gem 'pg', '~> 1.1'
gem 'rails', '~> 7.0.8.5'
gem "sprockets-rails"
gem 'rails-html-sanitizer', '>= 1.4.4' # >= 1.4.4 due to CVE-2022-23519
gem 'loofah', '>= 2.19.1' # >= 2.19.1 due to GHSA-228g-948r-83gx
gem 'sprockets-rails'
gem 'rails-html-sanitizer'
gem 'loofah'
gem 'tzinfo', '>= 1.2.10' # CVE-2022-31163

# No longer default gems
gem 'irb'
gem 'reline'
gem 'benchmark'
gem 'rdoc'
gem 'mutex_m'
gem 'drb'

gem 'bcrypt'
gem 'bootsnap'
gem 'composite_primary_keys', '~> 14.0.9'
gem 'csv', '>= 1.0.2' # support for bom|utf-8 in ruby 2.5
gem 'csv'
gem 'order_as_specified'
gem 'with_advisory_lock'
gem 'nokogiri', '>= 1.16.4' # GHSA-r95h-9x8f-r3f7
gem 'nokogiri'

gem 'autoprefixer-rails'
gem 'haml-rails'
Expand Down Expand Up @@ -68,14 +76,14 @@ gem 'aws-sdk-cloudwatchlogs', require: false
gem 'json'
gem 'amazing_print'

gem 'puma', '>= 6.4.2'
gem 'puma', '~> 6'
gem 'redis'

gem 'activerecord-session_store'
gem 'lograge'
gem 'logstop'
gem 'paper_trail'
gem 'paranoia', '~> 2.0'
gem 'paper_trail'#, '~> 15' # 16 breaks models with inherited has_paper_trail, need to update significant code
gem 'paranoia'
gem 'validate_url'
gem 'StreetAddress', require: false
gem 'marginalia'
Expand Down Expand Up @@ -117,9 +125,6 @@ gem 'auto-session-timeout'

gem 'ruby_parser', require: false

# gem 'axlsx', git: 'https://github.com/randym/axlsx.git'
# gem 'axlsx_rails'
# gem 'spreadsheet', require: false
gem 'caxlsx'
gem 'caxlsx_rails'
gem 'xlsxtream', require: false
Expand All @@ -140,10 +145,11 @@ gem 'yabeda-puma-plugin'
gem 'yabeda-http_requests'
gem 'roda'

gem 'k8s-ruby'
# Once 0.17 is released we should be able to unpin this
# https://github.com/k8s-ruby/k8s-ruby/pull/57
gem 'k8s-ruby', github: 'k8s-ruby/k8s-ruby', branch: 'master'

group :development do
# gem 'spring'
gem 'capistrano'
gem 'capistrano-bundler'
gem 'capistrano-passenger'
Expand All @@ -157,7 +163,6 @@ group :development do
gem 'rails-erd'
gem 'ruby-prof'
gem 'web-console'
# gem 'rb-readline'
gem 'active_record_query_trace'
end

Expand Down
Loading
Loading