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

Upgrade to rails 7.1 #3734

Merged
merged 1 commit into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 21 additions & 5 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2024-01-16 17:52:42 UTC using RuboCop version 1.59.0.
# on 2024-01-17 14:25:30 UTC using RuboCop version 1.59.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -94,12 +94,13 @@ Layout/EmptyLineBetweenDefs:
Exclude:
- 'app/models/concerns/cjk_query.rb'

# Offense count: 4
# Offense count: 8
# This cop supports safe autocorrection (--autocorrect).
Layout/EmptyLines:
Exclude:
- 'app/models/concerns/cjk_query.rb'
- 'app/views/catalog/index.atom.builder'
- 'config/initializers/new_framework_defaults_7_1.rb'
- 'spec/spec_helper.rb'
- 'spec/views/catalog/thumbnails/_collection_thumbnail.html.erb_spec.rb'

Expand Down Expand Up @@ -285,6 +286,14 @@ Layout/MultilineMethodCallBraceLayout:
- 'spec/views/catalog/_accordion_section_course_reserves.html.erb_spec.rb'
- 'spec/views/catalog/_accordion_section_library.html.erb_spec.rb'

# Offense count: 2
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, IndentationWidth.
# SupportedStyles: aligned, indented, indented_relative_to_receiver
Layout/MultilineMethodCallIndentation:
Exclude:
- 'config/environments/production.rb'

# Offense count: 7
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, IndentationWidth.
Expand Down Expand Up @@ -362,12 +371,13 @@ Layout/SpaceInsideParens:
- 'app/views/catalog/index.atom.builder'
- 'spec/components/access_panels/at_the_library_component_spec.rb'

# Offense count: 9
# Offense count: 10
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowInHeredoc.
Layout/TrailingWhitespace:
Exclude:
- 'app/views/catalog/index.atom.builder'
- 'config/initializers/new_framework_defaults_7_1.rb'

# Offense count: 4
# This cop supports safe autocorrection (--autocorrect).
Expand Down Expand Up @@ -1273,7 +1283,7 @@ Style/FetchEnvVar:
Exclude:
- 'app/models/user.rb'

# Offense count: 519
# Offense count: 520
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: always, always_true, never
Expand Down Expand Up @@ -1519,6 +1529,12 @@ Style/RedundantCondition:
- 'app/views/catalog/_index_default.mobile.builder'
- 'app/views/catalog/index.mobile.builder'

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
Style/RedundantConstantBase:
Exclude:
- 'config/environments/production.rb'

# Offense count: 2
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: SafeForConstants.
Expand Down Expand Up @@ -1652,7 +1668,7 @@ Style/StringConcatenation:
- 'config/application.rb'
- 'config/initializers/okcomputer.rb'

# Offense count: 2645
# Offense count: 2648
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
# SupportedStyles: single_quotes, double_quotes
Expand Down
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.0'
gem 'rails', '~> 7.1'
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"
# Use Puma as the app server
gem 'puma', '~> 5.0'
gem 'puma', '~> 6.0'
# Use SCSS for stylesheets
gem 'sassc-rails'

Expand All @@ -24,7 +24,6 @@ group :development do
# Display performance information such as SQL time and flame graphs for each request in your browser.
# Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
gem 'rack-mini-profiler', '~> 2.0'
gem 'listen', '~> 3.3'
gem "letter_opener"
end

Expand Down
Loading