Skip to content

Commit 9b1e524

Browse files
committed
Merge branch 'main' into lunny/remove_num_watches
2 parents f45289c + a175f98 commit 9b1e524

Some content is hidden

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

50 files changed

+392
-330
lines changed

.eslintrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ rules:
642642
no-this-before-super: [2]
643643
no-throw-literal: [2]
644644
no-undef-init: [2]
645-
no-undef: [2, {typeof: true}]
645+
no-undef: [2, {typeof: true}] # TODO: disable this rule after tsc passes
646646
no-undefined: [0]
647647
no-underscore-dangle: [0]
648648
no-unexpected-multiline: [2]

models/fixtures/system_setting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-
22
id: 1
33
setting_key: 'picture.disable_gravatar'
4-
setting_value: 'false'
4+
setting_value: 'true'
55
version: 1
66
created: 1653533198
77
updated: 1653533198

0 commit comments

Comments
 (0)