Skip to content

Commit

Permalink
OPT: Bump rails from 7.2.2 to 8.0.0
Browse files Browse the repository at this point in the history
Bumps [rails](https://github.com/rails/rails) from 7.2.2 to 8.0.0.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](rails/rails@v7.2.2...v8.0.0)

---
updated-dependencies:
- dependency-name: rails
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and gmmcal committed Nov 10, 2024
1 parent 32e41e9 commit 871bf87
Show file tree
Hide file tree
Showing 35 changed files with 955 additions and 275 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
with:
name: Rubocop
image: "gmmcal/gmmcal:test-${{ github.event.number }}-${{ github.run_number }}"
command: bundle exec rubocop --config .rubocop.yml .
command: bin/rubocop
needs: build

reek:
Expand All @@ -81,7 +81,7 @@ jobs:
with:
name: Brakeman
image: "gmmcal/gmmcal:test-${{ github.event.number }}-${{ github.run_number }}"
command: bundle exec brakeman
command: bin/brakeman
needs: build

scsslint:
Expand Down
36 changes: 18 additions & 18 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
require:
- rubocop-factory_bot
- rubocop-rails
- rubocop-rspec
- rubocop-factory_bot
- rubocop-rspec_rails

AllCops:
TargetRubyVersion: 3.0
TargetRubyVersion: 3.3
DisplayCopNames: true
NewCops: enable
Exclude:
- 'bin/**/*'
- 'db/schema.rb'
- 'node_modules/**/*'
- 'vendor/**/*'
- "bin/**/*"
- "db/schema.rb"
- "node_modules/**/*"
- "vendor/**/*"

Rails:
Enabled: true

Style/PercentLiteralDelimiters:
PreferredDelimiters:
default: ()
'%i': '[]'
'%w': '[]'

"%i": "[]"
"%w": "[]"
Style/Documentation:
Enabled: false

Expand All @@ -30,20 +30,20 @@ Lint/ScriptPermission:

Metrics/BlockLength:
Exclude:
- 'lib/tasks/*'
- 'spec/**/*'
- 'config/routes.rb'
- "lib/tasks/*"
- "spec/**/*"
- "config/routes.rb"

Layout/LineLength:
Exclude:
- 'config/**/*'
- 'db/**/*'
- 'spec/**/*'
- "config/**/*"
- "db/**/*"
- "spec/**/*"

Metrics/MethodLength:
Exclude:
- 'db/migrate/*'
- 'lib/seed_manager.rb'
- "db/migrate/*"
- "lib/seed_manager.rb"

Rails/LexicallyScopedActionFilter:
Enabled: false
Expand All @@ -59,7 +59,7 @@ Style/MixinUsage:

Layout/SpaceInsideArrayLiteralBrackets:
Exclude:
- 'config/**/*'
- "config/**/*"

Layout/SpaceAroundMethodCallOperator:
Enabled: true
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1

# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
ARG RUBY_VERSION=3.3
ARG RUBY_VERSION=3.3.5
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base

# Rails app lives here
Expand Down
9 changes: 5 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem 'bootsnap', require: false
# use PostgreSQL as database
gem 'pg'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.2.2'
gem 'rails', '~> 8.0.0'

# Frontend gems
gem 'draper'
Expand Down Expand Up @@ -44,9 +44,10 @@ group :development do
gem 'listen'
gem 'reek'
gem 'rubocop'
gem 'rubocop-factory_bot'
gem 'rubocop-rails'
gem 'rubocop-rspec'
gem 'rubocop-factory_bot', require: false
gem 'rubocop-rails', require: false
gem 'rubocop-rspec', require: false
gem 'rubocop-rspec_rails', require: false
gem 'scss_lint', require: false
end

Expand Down
127 changes: 66 additions & 61 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,70 +1,69 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
actioncable (8.0.0)
actionpack (= 8.0.0)
activesupport (= 8.0.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.2.2)
actionpack (= 7.2.2)
activejob (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
actionmailbox (8.0.0)
actionpack (= 8.0.0)
activejob (= 8.0.0)
activerecord (= 8.0.0)
activestorage (= 8.0.0)
activesupport (= 8.0.0)
mail (>= 2.8.0)
actionmailer (7.2.2)
actionpack (= 7.2.2)
actionview (= 7.2.2)
activejob (= 7.2.2)
activesupport (= 7.2.2)
actionmailer (8.0.0)
actionpack (= 8.0.0)
actionview (= 8.0.0)
activejob (= 8.0.0)
activesupport (= 8.0.0)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.2.2)
actionview (= 7.2.2)
activesupport (= 7.2.2)
actionpack (8.0.0)
actionview (= 8.0.0)
activesupport (= 8.0.0)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4, < 3.2)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (7.2.2)
actionpack (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
actiontext (8.0.0)
actionpack (= 8.0.0)
activerecord (= 8.0.0)
activestorage (= 8.0.0)
activesupport (= 8.0.0)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.2.2)
activesupport (= 7.2.2)
actionview (8.0.0)
activesupport (= 8.0.0)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.2.2)
activesupport (= 7.2.2)
activejob (8.0.0)
activesupport (= 8.0.0)
globalid (>= 0.3.6)
activemodel (7.2.2)
activesupport (= 7.2.2)
activemodel (8.0.0)
activesupport (= 8.0.0)
activemodel-serializers-xml (1.0.3)
activemodel (>= 5.0.0.a)
activesupport (>= 5.0.0.a)
builder (~> 3.1)
activerecord (7.2.2)
activemodel (= 7.2.2)
activesupport (= 7.2.2)
activerecord (8.0.0)
activemodel (= 8.0.0)
activesupport (= 8.0.0)
timeout (>= 0.4.0)
activestorage (7.2.2)
actionpack (= 7.2.2)
activejob (= 7.2.2)
activerecord (= 7.2.2)
activesupport (= 7.2.2)
activestorage (8.0.0)
actionpack (= 8.0.0)
activejob (= 8.0.0)
activerecord (= 8.0.0)
activesupport (= 8.0.0)
marcel (~> 1.0)
activesupport (7.2.2)
activesupport (8.0.0)
base64
benchmark (>= 0.3)
bigdecimal
Expand All @@ -76,10 +75,11 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
ast (2.4.2)
base64 (0.2.0)
bcrypt (3.1.20)
benchmark (0.3.0)
benchmark (0.4.0)
bigdecimal (3.1.8)
bootsnap (1.18.4)
msgpack (~> 1.2)
Expand Down Expand Up @@ -227,7 +227,7 @@ GEM
matrix (~> 0.4)
pdf-core (~> 0.10.0)
ttfunk (~> 1.8)
psych (5.1.2)
psych (5.2.0)
stringio
puma (6.4.3)
nio4r (~> 2.0)
Expand All @@ -243,30 +243,30 @@ GEM
rack (>= 1.3)
rackup (2.2.0)
rack (>= 3)
rails (7.2.2)
actioncable (= 7.2.2)
actionmailbox (= 7.2.2)
actionmailer (= 7.2.2)
actionpack (= 7.2.2)
actiontext (= 7.2.2)
actionview (= 7.2.2)
activejob (= 7.2.2)
activemodel (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
rails (8.0.0)
actioncable (= 8.0.0)
actionmailbox (= 8.0.0)
actionmailer (= 8.0.0)
actionpack (= 8.0.0)
actiontext (= 8.0.0)
actionview (= 8.0.0)
activejob (= 8.0.0)
activemodel (= 8.0.0)
activerecord (= 8.0.0)
activestorage (= 8.0.0)
activesupport (= 8.0.0)
bundler (>= 1.15.0)
railties (= 7.2.2)
railties (= 8.0.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
railties (8.0.0)
actionpack (= 8.0.0)
activesupport (= 8.0.0)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
Expand All @@ -289,7 +289,7 @@ GEM
rainbow (>= 2.0, < 4.0)
rexml (~> 3.1)
regexp_parser (2.9.2)
reline (0.5.10)
reline (0.5.11)
io-console (~> 0.5)
request_store (1.7.0)
rack (>= 1.4)
Expand Down Expand Up @@ -335,6 +335,9 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (3.2.0)
rubocop (~> 1.61)
rubocop-rspec_rails (2.30.0)
rubocop (~> 1.61)
rubocop-rspec (~> 3, >= 3.0.1)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
sass (3.7.4)
Expand Down Expand Up @@ -363,9 +366,9 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
stringio (3.1.1)
stringio (3.1.2)
thor (1.3.2)
timeout (0.4.1)
timeout (0.4.2)
ttfunk (1.8.0)
bigdecimal (~> 3.1)
turbo-rails (2.0.11)
Expand All @@ -374,6 +377,7 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
uri (1.0.1)
useragent (0.16.10)
warden (1.2.9)
rack (>= 2.0.9)
Expand Down Expand Up @@ -417,14 +421,15 @@ DEPENDENCIES
puma
pundit
rack-cors
rails (~> 7.2.2)
rails (~> 8.0.0)
redis
reek
rspec-rails
rubocop
rubocop-factory_bot
rubocop-rails
rubocop-rspec
rubocop-rspec_rails
scss_lint
shoulda-matchers
simple_form
Expand Down
2 changes: 0 additions & 2 deletions Procfile

This file was deleted.

1 change: 0 additions & 1 deletion Procfile.dev

This file was deleted.

1 change: 1 addition & 0 deletions app/decorators/application_decorator.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

class ApplicationDecorator < Draper::Decorator
def marshal_load(*); end
end
8 changes: 4 additions & 4 deletions app/lib/pdf/format.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

module Pdf
module Format
def column(start, finish, &block)
pdf.grid(start, finish).bounding_box(&block)
def column(start, finish, &)
pdf.grid(start, finish).bounding_box(&)
end

def h1
Expand Down Expand Up @@ -48,8 +48,8 @@ def body(color: '000000', padding: 10, &block)
end
end

def strong_body(&block)
pdf.font 'Helvetica', size: 13, style: :bold, &block
def strong_body(&)
pdf.font('Helvetica', size: 13, style: :bold, &)
end

def html(content)
Expand Down
7 changes: 7 additions & 0 deletions bin/brakeman
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env ruby
require "rubygems"
require "bundler/setup"

ARGV.unshift("--ensure-latest")

load Gem.bin_path("brakeman", "brakeman")
Loading

0 comments on commit 871bf87

Please sign in to comment.