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

RAILS Upgrade from 6.1.7 to 7.0.8 #345

Open
wants to merge 18 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
4 changes: 2 additions & 2 deletions .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ STORAGE_REGION
STORAGE_SECRET_ACCESS_KEY

# settings used to convert text-to-speech
TEXT_TO_SPEECH_LANGUAGE
TEXT_TO_SPEECH_LANGUAGE=en-US
TEXT_TO_SPEECH_PROVIDER=Google
TEXT_TO_SPEECH_VOICE
TEXT_TO_SPEECH_VOICE=en-US-Standard-C

# api credentials for sending sms
TWILIO_ACCOUNT_SID
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
needs: setup_environment
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
chunk: ${{ fromJson(needs.setup_environment.outputs.test-chunk-ids) }}
services:
Expand Down
12 changes: 6 additions & 6 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ AllCops:
Bundler/OrderedGems:
Enabled: false

RSpec/FactoryBot:
Enabled: false

Layout/DotPosition:
Enabled: false

Expand Down Expand Up @@ -280,6 +277,9 @@ Style/RedundantRegexpEscape:
Style/RedundantSelfAssignment:
Enabled: true

Style/SafeNavigationChainLength:
Max: 5

Style/SingleArgumentDig:
Enabled: true

Expand Down Expand Up @@ -412,13 +412,13 @@ RSpec/VerifiedDoubles:
Exclude:
- 'spec/**/*'

RSpec/FilePath:
Enabled: true

RSpec/AnyInstance:
Exclude:
- 'spec/**/*'

RSpec/IndexedLet:
Enabled: false

RSpec/StubbedMock:
Exclude:
- 'spec/requests/v1/organizations/invitations/invite_organization_admin_spec.rb'
Expand Down
7 changes: 6 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'

ruby '3.1.4'

gem 'rails', '~> 6.1.7', '>= 6.1.7.9'
gem 'rails', '~> 7.0.0'
gem 'pg', '~> 1.2'
gem 'puma', '~> 5.6.9'

Expand Down Expand Up @@ -63,6 +63,11 @@ gem 'sentry-rails', '~> 5.7'
gem 'jwt', '~> 2.6'
gem 'grpc', '~> 1.53.2'
gem 'aasm', '~> 5.1', '>= 5.1.1'
# for faraday multipart
gem 'faraday-multipart'

# for upgrading rails to 7.0. This line can be removed after upgrading to rails 7.1
gem 'concurrent-ruby', '1.3.4'

group :development, :test do
gem 'bundler-audit'
Expand Down
Loading
Loading