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 Rails 8.0 #1434

Merged
merged 16 commits into from
Oct 29, 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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
AllCops:
Exclude:
- lib/templates/**/*
# Omakase Ruby styling for Rails
inherit_gem: { rubocop-rails-omakase: rubocop.yml }
# Overwrite or add rules to create your own house style
#
# # Use `[a, [b, c]]` not `[ a, [ b, c ] ]`
Layout/SpaceInsideArrayLiteralBrackets:
Enabled: false
6 changes: 0 additions & 6 deletions .standard.yml

This file was deleted.

7 changes: 1 addition & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,5 @@
"i18n-ally.sourceLanguage": "zh-CN",
"i18n-ally.translate.engines": ["opencc", "google"],
"prettier.singleQuote": false,
"ruby.format": "standard",
"ruby.lint": {
"standard": {
"useBundler": true
}
}
"ruby.format": "rubocop"
}
7 changes: 2 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# frozen_string_literal: true

source "https://rubygems.org"

git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }

gem "jbuilder"
gem "rails", "~> 7.1.3"
gem "rails", "~> 8.0.0.beta1"
gem "rails_autolink"
gem "sass-rails"
gem "shakapacker", "~> 7.2.1"
Expand Down Expand Up @@ -65,7 +63,6 @@ gem "pghero"
# Cache
gem "connection_pool"
gem "redis"
gem "second_level_cache"

# Setting
gem "rails-settings-cached"
Expand Down Expand Up @@ -109,5 +106,5 @@ group :development, :test do
gem "minitest-spec-rails"
gem "mocha"

gem "standard"
gem "rubocop-rails-omakase", require: false
end
Loading
Loading