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

chore(deps): update to rails 7.1 #530

Open
wants to merge 41 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
89c3be5
chore(deps): update all non-major bundler dependencies
renovate[bot] Mar 6, 2025
a6712d5
Update Gemfile
lodewiges Mar 9, 2025
09a8336
Update Gemfile
lodewiges Mar 9, 2025
af1bfac
moved factory bot to plugins rubocop
lodewiges Mar 9, 2025
8398923
generated gem.lock file
lodewiges Mar 9, 2025
70b972b
chore(deps): update all non-major bundler dependencies
renovate[bot] Mar 9, 2025
b657eff
Update Gemfile
lodewiges Mar 9, 2025
5cc0a5e
Update Gemfile
lodewiges Mar 9, 2025
a9d1372
Merge branch 'renovate/all-minor-patch-bundler'
lodewiges Mar 9, 2025
2130cb5
generated gem.lock
lodewiges Mar 9, 2025
ae90b53
chore(deps): update all non-major bundler dependencies
renovate[bot] Mar 10, 2025
f8f4c24
Update Gemfile
lodewiges Mar 10, 2025
e34e6f0
Merge branch 'renovate/all-minor-patch-bundler'
lodewiges Mar 10, 2025
2a03f4d
generate gemfile.lock
lodewiges Mar 10, 2025
0afe737
fix build
lodewiges Mar 10, 2025
460a3c5
updated bullet
lodewiges Mar 10, 2025
a745ecc
fixed lint
lodewiges Mar 10, 2025
9bd3cd5
archived migration
lodewiges Mar 10, 2025
e95541b
fixed deprecation errors
lodewiges Mar 10, 2025
c52f398
update rspec-rails
lodewiges Mar 10, 2025
6527965
re add deprecation
lodewiges Mar 10, 2025
dc8cd1d
update rspec-rails
lodewiges Mar 10, 2025
70a97bc
downgrade rails
lodewiges Mar 10, 2025
b7c68f4
readded concurrent ruby
lodewiges Mar 10, 2025
ea33f68
fix bullet test failure
lodewiges Mar 10, 2025
b9e600c
revert change
lodewiges Mar 10, 2025
cb3864d
update all depencies
lodewiges Mar 10, 2025
752ddc2
fix tests?
lodewiges Mar 10, 2025
c78352d
fix lint
lodewiges Mar 10, 2025
98232f5
updated ruby
lodewiges Mar 10, 2025
0c7c84b
hopefully improving tests
lodewiges Mar 10, 2025
9d6d7b6
fix final test
lodewiges Mar 10, 2025
4019c1e
excuted rails app update
lodewiges Mar 10, 2025
4246de1
Reverted bin/ci.sh to commit 9d6d7b6
lodewiges Mar 10, 2025
392f03c
added new files
lodewiges Mar 10, 2025
0b5442e
fixed lint add executed migration
lodewiges Mar 11, 2025
6d5dbfd
improve aplication.rb
lodewiges Mar 11, 2025
742c55e
fixed lint and tests
lodewiges Mar 11, 2025
2a3dcbf
fixed deprecation
lodewiges Mar 11, 2025
6c9179b
first part new defaults
lodewiges Mar 11, 2025
620e8a9
part 2
lodewiges Mar 11, 2025
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
9 changes: 2 additions & 7 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
require:
- rubocop-rspec_rails

plugins:
- rubocop-factory_bot
- rubocop-performance
- rubocop-rspec
- rubocop-rails
- rubocop-rspec_rails

AllCops:
TargetRailsVersion: 7.0
TargetRailsVersion: 7.1
TargetRubyVersion: 3.3
Exclude:
- 'db/schema.rb'
Expand All @@ -33,9 +31,6 @@ Metrics/BlockLength:
- 'config/routes.rb'
- 'spec/**/*'

Layout/LineLength:
Max: 100

Metrics/MethodLength:
Exclude:
- 'db/migrate/*'
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ RUN apk add --update \
tzdata \
libffi-dev \
build-base \
yaml-dev \
&& rm -rf /var/cache/apk/*

RUN mkdir /app
Expand Down
9 changes: 4 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ gem 'carrierwave', '~> 3.1', '>= 3.1.1'
gem 'carrierwave-base64', '~> 2.11'
gem 'carrierwave-bombshelter', '~> 0.2', '>= 0.2.2'
gem 'case_transform', '~> 0.2'
gem 'concurrent-ruby', '1.3.4' # can be removed when we upgrade to rails 7.1 https://www.devgem.io/posts/resolving-the-loggerthreadsafelevel-error-in-rails-after-bundle-update
gem 'counter_culture', '~> 3.8', '>= 3.8.2'
gem 'doorkeeper', '~> 5.8', '>= 5.8.1'
gem 'doorkeeper-i18n', '~> 5.2', '>= 5.2.7'
Expand All @@ -30,7 +29,7 @@ gem 'puma', '~> 6.6'
gem 'pundit', '~> 2.5'
gem 'rack-attack', '~> 6.7'
gem 'rack-cors', '~> 2.0', '>= 2.0.2', require: 'rack/cors'
gem 'rails', '~> 7.0.0', '>= 7.0.8.7'
gem 'rails', '~> 7.1.0', '>= 7.1.5.1'
gem 'rails-i18n', '~> 7.0', '>= 7.0.10'
gem 'redis', '~> 5.4'
gem 'roo', '~> 2.10', '>= 2.10.1'
Expand All @@ -48,7 +47,7 @@ gem 'vpim', '~> 24.2', '>= 24.2.20'
group :development, :test do
gem 'awesome_print'
gem 'brakeman', require: false
gem 'bullet'
gem 'bullet', '~> 7.2'
gem 'colorize'
gem 'consistency_fail'
gem 'dotenv-rails'
Expand All @@ -73,13 +72,13 @@ end

group :test do
gem 'guard-rspec', require: false
gem 'rspec-rails'
gem 'rspec-rails', '~> 6.1', '>= 6.1.5'
gem 'rubocop', '~> 1.73', '>= 1.73.2', require: false
gem 'rubocop-factory_bot', '~> 2.27', require: false
gem 'rubocop-performance', '~> 1.24', '>= 1.24.0', require: false
gem 'rubocop-rails', '~> 2.30', '>= 2.30.3', require: false
gem 'rubocop-rspec', '~> 3.5', '>= 3.5.0', require: false
gem 'rubocop-rspec_rails', '~> 2.30', '>= 2.30.0', require: false
gem 'rubocop-rspec_rails', '~> 2.31', require: false
gem 'simplecov', require: false
gem 'simplecov-lcov', '~> 0.8.0', require: false
gem 'terminal-notifier-guard'
Expand Down
Loading