Skip to content

Commit c6b5aaf

Browse files
authored
Merge branch 'main' into td-5059-non-negative-purchase_value
2 parents 95a1557 + 2fa170c commit c6b5aaf

File tree

399 files changed

+7402
-2919
lines changed

Some content is hidden

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

399 files changed

+7402
-2919
lines changed

.annotaterb.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
:position: before
3+
:position_in_additional_file_patterns: before
4+
:position_in_class: before
5+
:position_in_factory: before
6+
:position_in_fixture: before
7+
:position_in_routes: before
8+
:position_in_serializer: before
9+
:position_in_test: before
10+
:classified_sort: true
11+
:exclude_controllers: true
12+
:exclude_factories: false
13+
:exclude_fixtures: false
14+
:exclude_helpers: true
15+
:exclude_scaffolds: true
16+
:exclude_serializers: false
17+
:exclude_sti_subclasses: false
18+
:exclude_tests: false
19+
:force: false
20+
:format_markdown: false
21+
:format_rdoc: false
22+
:format_yard: false
23+
:frozen: false
24+
:ignore_model_sub_dir: false
25+
:ignore_unknown_models: false
26+
:include_version: false
27+
:show_check_constraints: false
28+
:show_complete_foreign_keys: false
29+
:show_foreign_keys: false
30+
:show_indexes: false
31+
:simple_indexes: false
32+
:sort: false
33+
:timestamp: false
34+
:trace: false
35+
:with_comment: true
36+
:with_column_comments: true
37+
:with_table_comments: true
38+
:active_admin: false
39+
:command:
40+
:debug: false
41+
:hide_default_column_types: ""
42+
:hide_limit_column_types: ""
43+
:ignore_columns:
44+
:ignore_routes:
45+
:models: true
46+
:routes: false
47+
:skip_on_db_migrate: false
48+
:target_action: :do_annotations
49+
:wrapper:
50+
:wrapper_close:
51+
:wrapper_open:
52+
:classes_default_to_s: []
53+
:additional_file_patterns: []
54+
:model_dir:
55+
- app/models
56+
:require: []
57+
:root_dir:
58+
- ""

.cloud66/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
rails:
22
configuration:
3-
ruby_version: 3.2.2
3+
ruby_version: 3.4.3

.github/workflows/ruby_lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
- name: lint
2828
run: bundle exec rubocop
2929
- name: lint erb files
30-
run: bundle exec erblint --lint-all
30+
run: bundle exec erb_lint --lint-all

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,4 @@ package-lock.json
8888
out/
8989

9090
.vscode/
91+
.aider*

.rubocop.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ inherit_gem:
1010
inherit_from:
1111
.rubocop_todo.yml
1212

13-
require:
14-
- rubocop-rails
13+
plugins:
1514
- rubocop-performance
16-
- standard
1715
- standard-rails
1816
- standard-performance
1917

18+
require:
19+
- rubocop-rails
20+
- standard
21+
2022
AllCops:
2123
Exclude:
2224
- "vendor/**/*"

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.4.3

CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ Follow [documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win1
2323

2424
Make sure to install **Ubuntu** as your Linux distribution. (This should be default.)
2525

26+
As noted [here](https://learn.microsoft.com/en-us/windows/wsl/compare-versions#comparing-features), WSL2 performs poorly when Linux processes try to access Windows files. For that reason, it's recommended that you clone the project to a directory in the Linux file system so the app and tests don't run slowly.
27+
28+
You might also want to try VSCode with [this WSL extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl) as an IDE that can run on Windows but still access the Linux file system.
29+
2630
**Note:** If you run into any issues with a command not running, restart your machine.
2731

2832

Gemfile

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ gem "pg", "~> 1.5.9"
1414
# Web server.
1515
gem "puma"
1616
# Rails web framework.
17-
gem "rails", "7.2.2"
17+
gem "rails", "~> 8.0.2"
1818

1919
###### MODELS / DATABASE #######
2020

@@ -32,9 +32,7 @@ gem "paper_trail"
3232
# Associates users with roles.
3333
gem "rolify", "~> 6.0"
3434
# Enforces "safe" migrations.
35-
# Pinned to 1.8.0 because 2.0.0 no longer support postgres v10
36-
# And as of now we are using postgres v10 in production
37-
gem "strong_migrations", "1.8.0"
35+
gem "strong_migrations"
3836
# used in events
3937
gem 'dry-struct'
4038
# Use solid_cache as a cache store
@@ -63,6 +61,8 @@ gem "filterrific"
6361
gem "jbuilder"
6462
# Pagination of models for use in views.
6563
gem "kaminari"
64+
# Prevents cookie overflow errors when storing large flash messages.
65+
gem 'memflash'
6666
# Web-based authorization framework.
6767
gem "omniauth"
6868
# Required to avoid authentication issues with Rails.
@@ -108,7 +108,10 @@ gem 'bootsnap', require: false
108108
# Technically they don't need to be in this Gemfile at all, but we are pinning them to
109109
# specific versions for compatibility reasons.
110110
gem "nokogiri", ">= 1.10.4"
111-
gem "sprockets", "~> 4.2.1"
111+
gem "sprockets", "~> 4.2.2"
112+
gem "prawn", "~> 2.4.0"
113+
gem "matrix" # Used by prawn
114+
gem "ttfunk", "~>1.7.0"
112115

113116
group :production, :staging do
114117
# Reduce the noise of logs and include custom fields to it for easier access
@@ -146,16 +149,16 @@ group :development, :test do
146149
# Debugger which supports rdbg and Shopify Ruby LSP VSCode extension
147150
gem "debug", ">= 1.0.0"
148151
# RSpec behavioral testing framework for Rails.
149-
gem "rspec-rails", "~> 7.1.0"
152+
gem "rspec-rails", "~> 8.0.0"
150153
# Static analysis / linter.
151154
gem "rubocop"
152155
# Rails add-on for static analysis.
153156
gem 'rubocop-performance'
154157
gem "rubocop-rails", "~> 2.25.1"
155158
# More concise test ("should") matchers
156-
gem "shoulda-matchers", "~> 6.4"
159+
gem "shoulda-matchers", "~> 6.5"
157160
# Default rules for Rubocop.
158-
gem "standard", "~> 1.40"
161+
gem "standard", "~> 1.50"
159162
gem "standard-rails"
160163
gem "standard-performance"
161164
# Erb linter.
@@ -164,7 +167,7 @@ end
164167

165168
group :development do
166169
# Show database columns and indexes inside files.
167-
gem "annotate"
170+
gem "annotaterb"
168171
# Used as a dependency for better_errors.
169172
gem "binding_of_caller"
170173
# Show a better error page on development, including a REPL.
@@ -203,7 +206,7 @@ group :test do
203206
# Show code coverage.
204207
gem 'simplecov'
205208
# Mock HTTP requests and ensure they are not called during tests.
206-
gem "webmock", "~> 3.24"
209+
gem "webmock", "~> 3.25"
207210
# Interface capybara to chrome headless
208211
gem "cuprite"
209212
# Read PDF files for tests

0 commit comments

Comments
 (0)