Skip to content

Commit b9476c5

Browse files
committed
Merge branch '4513_incontinence_supplies' of github.com:jadekstewart3/human-essentials into 4513_incontinence_supplies
2 parents 3699ba1 + 343100d commit b9476c5

77 files changed

Lines changed: 1214 additions & 406 deletions

File tree

Some content is hidden

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

.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+
- ""

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: 2 additions & 2 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.1"
1818

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

@@ -162,7 +162,7 @@ end
162162

163163
group :development do
164164
# Show database columns and indexes inside files.
165-
gem "annotate"
165+
gem "annotaterb"
166166
# Used as a dependency for better_errors.
167167
gem "binding_of_caller"
168168
# Show a better error page on development, including a REPL.

0 commit comments

Comments
 (0)