Skip to content

Commit 68fd2fe

Browse files
committed
Merge branch 'main' into 4770-snapshot-for-deleted-item
2 parents 9f81719 + 42c25ae commit 68fd2fe

File tree

269 files changed

+2110
-1405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+2110
-1405
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ dump.rdb
5151
*.pdf
5252
/spec/example_failures.txt
5353

54+
# Track, don't ignore, RSpec comparison PDFs
55+
!spec/fixtures/files/*.pdf
56+
5457
# Ignore Docker stuff (see issues #503, #603)
5558
Dockerfile
5659
docker-compose.yml

.rubocop.yml

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ inherit_mode:
44

55
inherit_gem:
66
standard: config/base.yml
7+
standard-rails: config/base.yml
8+
standard-performance: config/base.yml
79

810
inherit_from:
911
.rubocop_todo.yml
@@ -12,15 +14,17 @@ require:
1214
- rubocop-rails
1315
- rubocop-performance
1416
- standard
17+
- standard-rails
18+
- standard-performance
1519

1620
AllCops:
17-
TargetRubyVersion: 3.1.2
1821
Exclude:
1922
- "vendor/**/*"
2023
- "db/schema.rb"
2124
- "db/partners_schema.rb"
2225
- "db/seeds.rb"
2326
- "db/migrate/*"
27+
- "db/partners_migrate/*"
2428
- "bin/*"
2529
- "lib/files/cucumber.rake"
2630
- "lib/tasks/*"
@@ -29,26 +33,13 @@ AllCops:
2933
- "Rakefile"
3034
- "tmp/*"
3135
- "node_modules/**/*"
32-
UseCache: false
3336

3437
Rails:
3538
Enabled: true
36-
Rails/Output:
37-
Enabled: true
38-
Rails/Date:
39-
Enabled: true
4039
Rails/FilePath:
4140
Enabled: false
42-
Rails/FindBy:
43-
Enabled: true
44-
Rails/FindEach:
45-
Enabled: true
4641
Rails/PluralizationGrammar:
4742
Enabled: true
48-
Rails/ScopeArgs:
49-
Enabled: true
50-
Rails/TimeZone:
51-
Enabled: true
5243
Rails/UnknownEnv:
5344
Environments:
5445
- production
@@ -62,32 +53,27 @@ Rails/AfterCommitOverride:
6253
Enabled: false
6354
Rails/FindById:
6455
Enabled: false
65-
Rails/Inquiry:
66-
Enabled: false
6756
Rails/MailerName:
6857
Enabled: false
6958
Rails/MatchRoute:
7059
Enabled: false
71-
Rails/NegateInclude:
72-
Enabled: false
7360
Rails/Pluck:
7461
Enabled: false
7562
Rails/PluckInWhere:
7663
Enabled: false
77-
Rails/RenderInline:
78-
Enabled: false
7964
Rails/RenderPlainText:
8065
Enabled: false
8166
Rails/ShortI18n:
8267
Enabled: false
8368
Rails/SquishedSQLHeredocs:
8469
Enabled: false
85-
Rails/WhereExists:
86-
Enabled: false
87-
Rails/WhereNot:
88-
Enabled: false
8970
Rails/HasAndBelongsToMany:
9071
Enabled: false
72+
Rails/ThreeStateBooleanColumn:
73+
Enabled: true
74+
# FIXME: Fix our ENV variable access and remove the following config.
75+
Rails/EnvironmentVariableAccess:
76+
AllowReads: true
9177

9278
Rails/BulkChangeTable:
9379
Exclude:

Gemfile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ gem "rolify", "~> 6.0"
3737
gem "strong_migrations", "1.8.0"
3838
# used in events
3939
gem 'dry-struct'
40+
# Use solid_cache as a cache store
41+
gem "solid_cache", "~> 1.0"
4042

4143
##### JAVSCRIPT/CSS/ASSETS #######
4244

@@ -111,11 +113,6 @@ gem "nokogiri", ">= 1.10.4"
111113
gem "image_processing"
112114
gem "sprockets", "~> 4.2.1"
113115

114-
group :production do
115-
# Tool to detect unused code through knowing which methods are used in which files.
116-
gem 'coverband'
117-
end
118-
119116
group :production, :staging do
120117
# Reduce the noise of logs and include custom fields to it for easier access
121118
gem 'lograge'
@@ -152,14 +149,16 @@ group :development, :test do
152149
# Debugger which supports rdbg and Shopify Ruby LSP VSCode extension
153150
gem "debug", ">= 1.0.0"
154151
# RSpec behavioral testing framework for Rails.
155-
gem "rspec-rails", "~> 7.0.1"
152+
gem "rspec-rails", "~> 7.1.0"
156153
# Static analysis / linter.
157154
gem "rubocop"
158155
# Rails add-on for static analysis.
159156
gem 'rubocop-performance'
160157
gem "rubocop-rails", "~> 2.25.1"
161158
# Default rules for Rubocop.
162159
gem "standard", "~> 1.40"
160+
gem "standard-rails"
161+
gem "standard-performance"
163162
# Erb linter.
164163
gem "erb_lint"
165164
end
@@ -216,7 +215,4 @@ if %w(mingw mswin x64_mingw jruby).include?(RUBY_PLATFORM)
216215
gem "tzinfo-data", "~> 1.2", platforms: %i(mingw mswin x64_mingw jruby)
217216
end
218217

219-
# Use Redis for Action Cable
220-
gem "redis", "~> 5.3"
221-
222-
gem "importmap-rails", "~> 2.0"
218+
gem "importmap-rails", "~> 2.1"

0 commit comments

Comments
 (0)