Skip to content

Commit

Permalink
Upgrade to Rails 7.1 (nanego#147)
Browse files Browse the repository at this point in the history
* wip

* wip

* cleanups

* cleanups

* fix

* fix

* cleanups

* fix ci

* cleanups

* cleanup

* update gems

* update gems
  • Loading branch information
nicolas-brousse authored Mar 27, 2024
1 parent 8eb8e27 commit 22079d3
Show file tree
Hide file tree
Showing 44 changed files with 648 additions and 385 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ yarn.lock linguist-generated

# Mark any vendored files as having been vendored.
vendor/* linguist-vendored
config/credentials/*.yml.enc diff=rails_credentials
config/credentials.yml.enc diff=rails_credentials
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ jobs:

strategy:
matrix:
ruby-version: ['3.2.3']
ruby-version: ['3.3.0']
fail-fast: false

env:
RAILS_MASTER_KEY: "acf7c0d9c0f69afd05048c8a58b2e9ee"

services:
postgres:
image: postgres:13
Expand Down Expand Up @@ -63,7 +66,6 @@ jobs:
POSTGRES_USER: postgres
run: |
cp test/support/database-postgres.yml config/database.yml
cp test/support/secrets.yml config/secrets.yml
bundle exec rails db:setup
- name: Run tests
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,5 @@ public/uploads/
/config/master.key

.byebug_history

/config/credentials/test.key
7 changes: 5 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ Layout/FirstHashElementIndentation:
# Layout/LineLength:
# Max: 120

Layout/MultilineMethodCallIndentation:
EnforcedStyle: indented

Metrics/AbcSize:
Exclude:
- "db/**/*.rb"
Expand Down Expand Up @@ -70,8 +73,8 @@ Style/StringLiteralsInInterpolation:
# Style/TrailingCommaInArguments:
# EnforcedStyleForMultiline: comma

# Style/TrailingCommaInArrayLiteral:
# EnforcedStyleForMultiline: consistent_comma
Style/TrailingCommaInArrayLiteral:
EnforcedStyleForMultiline: consistent_comma

# Style/TrailingCommaInHashLiteral:
# EnforcedStyleForMultiline: consistent_comma
10 changes: 0 additions & 10 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -977,16 +977,6 @@ Style/TrailingCommaInArguments:
- 'config/initializers/geocoder.rb'
- 'lib/tasks/convert_activities_to_changelog_entries.rake'

# Offense count: 3
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyleForMultiline.
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
Style/TrailingCommaInArrayLiteral:
Exclude:
- 'app/services/glpi_client.rb'
- 'spec/components/list/datatable_component_spec.rb'
- 'spec/components/previews/list/data_table_component_preview.rb'

# Offense count: 11
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyleForMultiline.
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.3
3.3.0
12 changes: 5 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# frozen_string_literal: true

source "https://rubygems.org"
ruby "3.2.3"
gem "rails", "~> 7.0.8"
ruby file: ".ruby-version"

gem "rails", "~> 7.1.0"

gem "jbuilder"
gem "jquery-rails"
Expand Down Expand Up @@ -46,12 +47,9 @@ group :development do
end
group :development, :test do
gem "active_record_doctor"
gem "bullet"
gem "byebug"
gem "pry-rails"
gem "pry-rescue"
gem "puma"
gem "rack-mini-profiler"
gem "rack-mini-profiler", require: false
gem "rubocop", require: false
gem "rubocop-capybara", require: false
gem "rubocop-performance", require: false
Expand Down Expand Up @@ -103,7 +101,7 @@ gem "geocoder"
gem "debug", group: %i[test development]
gem "dekorator", "~> 1.4"
gem "diffy", "~> 3.4"
gem "importmap-rails", "~> 1.1"
gem "importmap-rails", "~> 2.0"
gem "lookbook"
gem "stimulus-rails", "~> 1.2"
gem "view_component"
Loading

0 comments on commit 22079d3

Please sign in to comment.