Skip to content

Commit

Permalink
Merge branch 'main' into lunny/remove_num_watches
Browse files Browse the repository at this point in the history
  • Loading branch information
lunny committed Nov 21, 2024
2 parents f45289c + a175f98 commit 9b1e524
Show file tree
Hide file tree
Showing 50 changed files with 392 additions and 330 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ rules:
no-this-before-super: [2]
no-throw-literal: [2]
no-undef-init: [2]
no-undef: [2, {typeof: true}]
no-undef: [2, {typeof: true}] # TODO: disable this rule after tsc passes
no-undefined: [0]
no-underscore-dangle: [0]
no-unexpected-multiline: [2]
Expand Down
2 changes: 1 addition & 1 deletion models/fixtures/system_setting.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-
id: 1
setting_key: 'picture.disable_gravatar'
setting_value: 'false'
setting_value: 'true'
version: 1
created: 1653533198
updated: 1653533198
Expand Down
Loading

0 comments on commit 9b1e524

Please sign in to comment.