Skip to content

Commit f51501e

Browse files
authored
Merge branch 'main' into migrate-release-changelog
2 parents 5ab72fd + 952132a commit f51501e

File tree

241 files changed

+2498
-2131
lines changed

Some content is hidden

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

241 files changed

+2498
-2131
lines changed

.commitlintrc.js

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
export default {
2+
extends: ["@commitlint/config-conventional"],
3+
rules: {
4+
/**
5+
* reduce header max length violation to a warning
6+
*/
7+
"header-max-length": [1, "always", 72]
8+
}
9+
}

.erb_lint.yml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
glob: "**/app/**/*.{html,turbo_stream,js}{+*,}.erb"
3+
EnableDefaultLinters: true
4+
exclude:
5+
- '**/vendor/**/*'
6+
linters:
7+
AllowedScriptType:
8+
enabled: true
9+
ClosingErbTagIndent:
10+
enabled: true
11+
DeprecatedClasses: # See https://github.com/Shopify/erb-lint#deprecatedclasses
12+
enabled: true
13+
ExtraNewline:
14+
enabled: true
15+
FinalNewline:
16+
enabled: true
17+
HardCodedString:
18+
enabled: false
19+
NoJavascriptTagHelper:
20+
enabled: true
21+
ParserErrors:
22+
enabled: true
23+
RightTrim:
24+
enabled: false
25+
RequireInputAutocomplete:
26+
enabled: false
27+
RubocopText:
28+
enabled: true
29+
SelfClosingTag:
30+
enabled: false
31+
SpaceAroundErbTag:
32+
enabled: true
33+
SpaceInHtmlTag:
34+
enabled: true
35+
SpaceIndentation:
36+
enabled: true
37+
TrailingWhitespace:
38+
enabled: true
39+
Rubocop:
40+
enabled: true
41+
rubocop_config:
42+
inherit_from:
43+
- .rubocop.yml
44+
AllCops:
45+
DisabledByDefault: true
46+
Layout/TrailingEmptyLines:
47+
Enabled: false
48+
Layout/InitialIndentation:
49+
Enabled: false
50+
Lint/UselessAssignment:
51+
Enabled: false
52+
Layout/ArgumentAlignment:
53+
Enabled: false
54+
Rails/OutputSafety:
55+
Enabled: false

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ jobs:
7373
- name: Lint Ruby files
7474
run: bin/rubocop -f github
7575

76+
- name: Lint ERB files
77+
run: bin/erb_lint --format compact --lint-all
78+
7679
- name: Set up database schema integrity
7780
run: bin/rails db:schema:load
7881

.github/workflows/commit.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Lint Commit Messages in Merge Queue
2+
3+
on:
4+
merge_group:
5+
types:
6+
- checks_requested
7+
8+
jobs:
9+
commitlint:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
ref: ${{ github.sha }}
15+
16+
- uses: wagoid/commitlint-github-action@v6

.irbrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require "irb/completion"
22
require "rubygems"
33

4+
IRB.conf[:USE_READLINE] = true
45
IRB.conf[:SAVE_HISTORY] = 1000
56
IRB.conf[:HISTORY_FILE] = ".irb-save-history"
67
IRB.conf[:USE_AUTOCOMPLETE] = false

.tool-versions

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ruby 3.3.6

Gemfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ gem "csv", "~> 3.3"
8282
gem "google-cloud-bigquery", "~> 1.50.0"
8383
gem "active_record_union", "~> 1.3"
8484
gem "pg_search", "~> 2.3"
85-
gem "redis_queued_locks", "~> 1.12"
86-
gem "net-imap", "~> 0.5.6"
85+
gem "redlock", "~> 2.0"
8786

8887
group :development, :test do
8988
gem "debug", platforms: %i[mri mingw x64_mingw]
@@ -102,6 +101,7 @@ group :development, :test do
102101
gem "rubocop-rspec_rails", require: false
103102
gem "stateoscope"
104103
gem "error_highlight"
104+
gem "erb_lint", require: false
105105
end
106106

107107
group :development do
@@ -111,6 +111,8 @@ group :development do
111111
gem "rack-mini-profiler"
112112
gem "letter_opener"
113113
gem "letter_opener_web"
114+
gem "pry-byebug"
115+
gem "readline"
114116
end
115117

116118
group :test do

0 commit comments

Comments
 (0)