Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ...

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

2023-07-12 16:03:05 +02:00

..

assets.rake

Fix most rubocop issues (#2165)

2023-04-09 11:25:30 +02:00

auto_annotate_models.rake

Autofix Rubocop remaining Layout rules (#23679)

2023-02-20 06:58:28 +01:00

branding.rake

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

db.rake

Autofix Rubocop Style/RedundantBegin (#23703)

2023-02-19 07:09:40 +09:00

emojis.rake

Autofix Rubocop Regex Style rules (#23690)

2023-06-06 14:50:51 +02:00

glitchsoc.rake

Fix most rubocop issues (#2165)

2023-04-09 11:25:30 +02:00

mastodon.rake

Autofix Rubocop Regex Style rules (#23690)

2023-06-06 14:50:51 +02:00

repo.rake

Fix Style/SlicingWithRange cop (#25923)

2023-07-12 10:03:06 +02:00

statistics.rake

Audofix Rubocop Style/WordArray (#23739)

2023-02-20 06:14:10 +01:00

tests.rake

Improve various queries against account domains (#25126)

2023-05-25 09:27:16 +02:00