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

Update Ruby on Rails to 7.2.0 #929

Merged
merged 27 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
27 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
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- name: Run rubocop
run: |
bundle exec rubocop

rspec:
needs: rubocop
runs-on: ubuntu-latest
Expand Down Expand Up @@ -58,6 +59,11 @@ jobs:

- uses: nanasess/setup-chromedriver@master

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libvips42

- name: Prepare config
run: |
mv config/database.yml.docker config/database.yml
Expand Down
4 changes: 3 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ inherit_mode:
require:
- rubocop-performance
- standard
- rubocop-factory_bot
- rubocop-capybara

inherit_gem:
standard: config/base.yml
Expand Down Expand Up @@ -56,5 +58,5 @@ Style/BlockDelimiters:
Enabled: true
EnforcedStyle: line_count_based

Lint/Env:
LintEnv:
Enabled: false
6 changes: 3 additions & 3 deletions .rubocop/rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ RSpec/MissingExampleGroupArgument:
RSpec/ReceiveCounts:
Enabled: true

RSpec/Capybara/CurrentPathExpectation:
Capybara/CurrentPathExpectation:
Enabled: true

RSpec/FactoryBot/AttributeDefinedStatically:
FactoryBot/AttributeDefinedStatically:
Enabled: true

RSpec/FactoryBot/CreateList:
FactoryBot/CreateList:
Enabled: true
4 changes: 2 additions & 2 deletions .rubocop_custom.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require:
# Cops source code lives in the lib/ folder
- ./lib/rubocop/cop/lint_env
- ./lib/rubo_cop/cop/lint_env

Lint/Env:
LintEnv:
Enabled: true
Include:
- "**/*.rb"
Expand Down
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gem "jbuilder", "~> 2.7"
gem "kaminari"
gem "pg", "~> 1.1"
gem "puma", "~> 5.0"
gem "rails", "~> 7.1", ">= 7.1.2"
gem "rails", "~> 7.2", ">= 7.2.0"
gem "redis", "~> 4.0"
gem "sass-rails", ">= 6"
gem "hotwire-rails"
Expand Down Expand Up @@ -48,7 +48,7 @@ gem "factory_bot_rails" # TODO: create ENV staging and use it for this

group :development, :test do
gem "annotate"
gem "dotenv-rails", require: "dotenv/rails-now"
gem "dotenv-rails", require: "dotenv/load"
gem "pry-rails"
gem "rails-controller-testing"
gem "rspec-rails"
Expand All @@ -61,6 +61,8 @@ group :development, :test, :ci do
gem "rubocop-performance", require: false
gem "rubocop-rails", require: false
gem "standard", "~> 1.0", require: false
gem "rubocop-factory_bot"
gem "rubocop-capybara"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

require false

end

group :development do
Expand Down
Loading
Loading