Skip to content

Commit

Permalink
Merge pull request #387 from sanger/depfu/update/group/rails-7.0.8.1
Browse files Browse the repository at this point in the history 
🚨 [security] Update rails 6.1.7.7 → 7.0.8.1 (major)
  • Loading branch information
@stevieing
stevieing authored Jul 5, 2024
2 parents 5b7a0b6 + 9d3d337 commit 65ea844
Show file tree
Hide file tree
Showing 27 changed files with 172 additions and 155 deletions.
50 changes: 16 additions & 34 deletions .rubocop_todo.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ Lint/DuplicateMethods:
# Offense count: 7
Lint/MissingSuper:
Exclude:
- 'app/presenters/asset/asset.rb'
- 'app/presenters/asset/index.rb'
- 'app/presenters/asset_type/asset_type.rb'
- 'app/presenters/batch/show.rb'
- 'app/presenters/report/new.rb'
- 'app/presenters/report/show.rb'
- 'app/presenters/workflow/show.rb'
- 'app/presenters/asset_presenter/asset.rb'
- 'app/presenters/asset_presenter/index.rb'
- 'app/presenters/asset_type_presenter/asset_type.rb'
- 'app/presenters/batch_presenter/show.rb'
- 'app/presenters/report_presenter/new.rb'
- 'app/presenters/report_presenter/show.rb'
- 'app/presenters/workflow_presenter/show.rb'

# Offense count: 6
Lint/UselessAssignment:
Expand Down Expand Up @@ -329,14 +329,14 @@ Style/CaseEquality:
Style/ClassAndModuleChildren:
Exclude:
- 'app/presenters/admin/index.rb'
- 'app/presenters/asset/asset.rb'
- 'app/presenters/asset/index.rb'
- 'app/presenters/asset_type/asset_type.rb'
- 'app/presenters/batch/new.rb'
- 'app/presenters/batch/show.rb'
- 'app/presenters/report/new.rb'
- 'app/presenters/report/show.rb'
- 'app/presenters/workflow/show.rb'
- 'app/presenters/asset_presenter/asset.rb'
- 'app/presenters/asset_presenter/index.rb'
- 'app/presenters/asset_type_presenter/asset_type.rb'
- 'app/presenters/batch_presenter/new.rb'
- 'app/presenters/batch_presenter/show.rb'
- 'app/presenters/report_presenter/new.rb'
- 'app/presenters/report_presenter/show.rb'
- 'app/presenters/workflow_presenter/show.rb'

# Offense count: 69
Style/Documentation:
Expand All @@ -359,15 +359,6 @@ Style/Documentation:
- 'app/models/event.rb'
- 'app/models/report.rb'
- 'app/models/workflow.rb'
- 'app/presenters/asset/asset.rb'
- 'app/presenters/asset/index.rb'
- 'app/presenters/asset_type/asset_type.rb'
- 'app/presenters/batch/new.rb'
- 'app/presenters/batch/show.rb'
- 'app/presenters/presenter.rb'
- 'app/presenters/report/new.rb'
- 'app/presenters/report/show.rb'
- 'app/presenters/workflow/show.rb'
- 'config/application.rb'
- 'config/data/asset_types.rb'
- 'config/data/pipeline_destinations.rb'
Expand Down Expand Up @@ -436,16 +427,7 @@ Style/FrozenStringLiteralComment:
- 'app/models/report.rb'
- 'app/models/state.rb'
- 'app/models/workflow.rb'
- 'app/presenters/admin/index.rb'
- 'app/presenters/asset/asset.rb'
- 'app/presenters/asset/index.rb'
- 'app/presenters/asset_type/asset_type.rb'
- 'app/presenters/batch/new.rb'
- 'app/presenters/batch/show.rb'
- 'app/presenters/presenter.rb'
- 'app/presenters/report/new.rb'
- 'app/presenters/report/show.rb'
- 'app/presenters/workflow/show.rb'
- 'app/presenters/report_presenter/show.rb'
- 'config.ru'
- 'config/application.rb'
- 'config/boot.rb'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1.6'
gem 'rails', '~> 7.0.8'
# Use mysql2 as the database for Active Record
gem 'mysql2'
# Use SCSS for stylesheets
Expand Down
154 changes: 80 additions & 74 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,71 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7.7)
actionpack (= 6.1.7.7)
activesupport (= 6.1.7.7)
actioncable (7.0.8.1)
actionpack (= 7.0.8.1)
activesupport (= 7.0.8.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.7)
actionpack (= 6.1.7.7)
activejob (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
actionmailbox (7.0.8.1)
actionpack (= 7.0.8.1)
activejob (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
mail (>= 2.7.1)
actionmailer (6.1.7.7)
actionpack (= 6.1.7.7)
actionview (= 6.1.7.7)
activejob (= 6.1.7.7)
activesupport (= 6.1.7.7)
net-imap
net-pop
net-smtp
actionmailer (7.0.8.1)
actionpack (= 7.0.8.1)
actionview (= 7.0.8.1)
activejob (= 7.0.8.1)
activesupport (= 7.0.8.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (6.1.7.7)
actionview (= 6.1.7.7)
activesupport (= 6.1.7.7)
rack (~> 2.0, >= 2.0.9)
actionpack (7.0.8.1)
actionview (= 7.0.8.1)
activesupport (= 7.0.8.1)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.7)
actionpack (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
actiontext (7.0.8.1)
actionpack (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (6.1.7.7)
activesupport (= 6.1.7.7)
actionview (7.0.8.1)
activesupport (= 7.0.8.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.7)
activesupport (= 6.1.7.7)
activejob (7.0.8.1)
activesupport (= 7.0.8.1)
globalid (>= 0.3.6)
activemodel (6.1.7.7)
activesupport (= 6.1.7.7)
activerecord (6.1.7.7)
activemodel (= 6.1.7.7)
activesupport (= 6.1.7.7)
activestorage (6.1.7.7)
actionpack (= 6.1.7.7)
activejob (= 6.1.7.7)
activerecord (= 6.1.7.7)
activesupport (= 6.1.7.7)
activemodel (7.0.8.1)
activesupport (= 7.0.8.1)
activerecord (7.0.8.1)
activemodel (= 7.0.8.1)
activesupport (= 7.0.8.1)
activestorage (7.0.8.1)
actionpack (= 7.0.8.1)
activejob (= 7.0.8.1)
activerecord (= 7.0.8.1)
activesupport (= 7.0.8.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.7)
activesupport (7.0.8.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
Expand All @@ -70,7 +76,7 @@ GEM
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.4)
builder (3.3.0)
capybara (3.40.0)
addressable
matrix
Expand All @@ -85,7 +91,7 @@ GEM
selenium-webdriver
childprocess (5.0.0)
coderay (1.1.3)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
crass (1.0.6)
database_cleaner (2.0.2)
database_cleaner-active_record (>= 2, < 3)
Expand All @@ -96,7 +102,7 @@ GEM
date (3.3.4)
diff-lcs (1.5.1)
docile (1.4.0)
erubi (1.12.0)
erubi (1.13.0)
exception_notification (4.5.0)
actionmailer (>= 5.2, < 8)
activesupport (>= 5.2, < 8)
Expand All @@ -106,7 +112,7 @@ GEM
ffi (1.15.5)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.4)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jbuilder (2.12.0)
actionview (>= 5.0.0)
Expand All @@ -128,14 +134,14 @@ GEM
net-imap
net-pop
net-smtp
marcel (1.0.2)
marcel (1.0.4)
matrix (0.4.2)
method_source (1.0.0)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
minitest (5.22.3)
mini_portile2 (2.8.7)
minitest (5.24.1)
mysql2 (0.5.6)
net-imap (0.4.10)
net-imap (0.4.14)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -144,8 +150,8 @@ GEM
timeout
net-smtp (0.5.0)
net-protocol
nio4r (2.7.0)
nokogiri (1.16.4)
nio4r (2.7.3)
nokogiri (1.16.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
parallel (1.25.1)
Expand All @@ -166,36 +172,36 @@ GEM
rack (>= 1.2.0)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.7)
actioncable (= 6.1.7.7)
actionmailbox (= 6.1.7.7)
actionmailer (= 6.1.7.7)
actionpack (= 6.1.7.7)
actiontext (= 6.1.7.7)
actionview (= 6.1.7.7)
activejob (= 6.1.7.7)
activemodel (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
rails (7.0.8.1)
actioncable (= 7.0.8.1)
actionmailbox (= 7.0.8.1)
actionmailer (= 7.0.8.1)
actionpack (= 7.0.8.1)
actiontext (= 7.0.8.1)
actionview (= 7.0.8.1)
activejob (= 7.0.8.1)
activemodel (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
bundler (>= 1.15.0)
railties (= 6.1.7.7)
sprockets-rails (>= 2.0.0)
railties (= 7.0.8.1)
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 (6.1.7.7)
actionpack (= 6.1.7.7)
activesupport (= 6.1.7.7)
railties (7.0.8.1)
actionpack (= 7.0.8.1)
activesupport (= 7.0.8.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.1.0)
rake (13.2.1)
rdoc (6.6.3.1)
psych (>= 4.0.0)
regexp_parser (2.9.2)
Expand Down Expand Up @@ -281,13 +287,13 @@ GEM
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets-rails (3.5.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
stringio (3.1.0)
strscan (3.1.0)
thor (1.3.0)
thor (1.3.1)
tilt (2.0.11)
timecop (0.9.8)
timeout (0.4.1)
Expand All @@ -310,7 +316,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.13)
zeitwerk (2.6.16)

PLATFORMS
ruby
Expand All @@ -332,7 +338,7 @@ DEPENDENCIES
pry
puma
rack-mini-profiler
rails (~> 6.1.6)
rails (~> 7.0.8)
rspec-collection_matchers
rspec-rails (~> 3.5.0)
rubocop
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/assets_controller.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require './app/presenters/asset/index'
require './app/presenters/asset_presenter/index'

class AssetsController < ApplicationController
def index
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/batches_controller.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require './app/presenters/batch/new'
require './app/presenters/batch/show'
require './app/presenters/batch_presenter/new'
require './app/presenters/batch_presenter/show'

class BatchesController < ApplicationController
before_action :batch, only: %i[show update remove]
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/reports_controller.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require './app/presenters/report/new'
require './app/presenters/report/show'
require './app/presenters/report_presenter/new'
require './app/presenters/report_presenter/show'

class ReportsController < ApplicationController
def show; end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/workflows_controller.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require './app/presenters/workflow/show'
require './app/presenters/workflow_presenter/show'

class WorkflowsController < ApplicationController
include InitialState
Expand Down
4 changes: 3 additions & 1 deletion app/presenters/admin/index.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# frozen_string_literal: true

require './app/presenters/presenter'
require './app/presenters/asset/asset'
require './app/presenters/asset_presenter/asset'

module Presenter::AdminPresenter
class Index < Presenter
Expand Down
Loading

0 comments on commit 65ea844

Please sign in to comment.