Commit graph

151 commits

Author SHA1 Message Date
Claire
6dbd44faea Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream 2023-05-28 15:01:53 +02:00
Claire
e2ab9d4dad Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream 2023-05-25 23:47:28 +02:00
Claire
2e02d03524 Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream 2023-05-25 22:59:30 +02:00
Claire
b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
2023-05-25 20:43:25 +02:00
Matt Jankowski
b896b16cb3
Fix RSpec/PredicateMatcher cop () 2023-05-23 16:49:11 +02:00
Matt Jankowski
778e4a7bf7
Fix RSpec/ExpectInHook cop () 2023-05-23 16:40:21 +02:00
Matt Jankowski
b6b4ea4ca5
Move the mastodon/*_cli files to mastodon/cli/* () 2023-05-23 16:08:26 +02:00
Matt Jankowski
541f64b2bb
Fix Rails/Exit cop () 2023-05-23 13:26:10 +02:00
Matt Jankowski
e387175fc9
Fix RSpec/RepeatedExample cop () 2023-05-23 10:49:23 +02:00
Matt Jankowski
9f5deb310b
Fix Performance/MapCompact cop ()
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-23 10:49:12 +02:00
Matt Jankowski
0664704cd9
Fix Performance/StartWith cop () 2023-05-23 10:16:50 +02:00
Matt Jankowski
325d5f0183
Regenerate rubocop-todo () 2023-05-22 14:49:10 +02:00
Nick Schonning
c0b9664a31
Autofix Rubocop spacing in config () 2023-05-22 13:17:56 +02:00
Nick Schonning
cee4369cf5
Autofix Rubocop Lint/AmbiguousOperatorPrecedence () 2023-05-16 10:51:59 +02:00
Matt Jankowski
2c2d924942
Fix RSpec/RepeatedExampleGroupDescription cop ()
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-12 12:25:32 +02:00
Matt Jankowski
bf3ebeb42f
Fix RSpec/SharedContext cop () 2023-05-12 09:25:43 +02:00
Matt Jankowski
a610a02d4f
Fix RSpec/ScatteredSetup cop () 2023-05-11 10:32:09 +02:00
Claire
8b31030fe4 Fix rubocop issues in glitch-soc-specific code 2023-05-08 19:28:43 +02:00
Claire
d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
Claire
2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.
2023-05-08 15:28:36 +02:00
Claire
9b59748679
Fix rubocop warnings () 2023-05-07 15:06:15 +02:00
Matt Jankowski
0b249ebdb0
Extract StatusSafeReblogInsert concern from Status () 2023-05-04 14:06:20 +02:00
Nick Schonning
569b39256b
Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml () 2023-05-04 11:56:24 +02:00
Nick Schonning
e1ebcc007d
Regenerate rubocop-todo () 2023-05-04 07:43:54 +02:00
Nick Schonning
ff3b7069cf
Autofix Rubocop Style/ConcatArrayLiterals () 2023-05-04 05:57:40 +02:00
Nick Schonning
da3bd913ae
Autofix Rubocop Style/HashSyntax () 2023-05-04 05:54:26 +02:00
Nick Schonning
d5a185d721
Autofix Rubocop Style/CaseLikeIf () 2023-05-04 05:51:18 +02:00
Nick Schonning
1fe04f740a
Enable Rubocop Rails/FilePath () 2023-05-04 05:50:40 +02:00
Matt Jankowski
c97b611b6b
Fix RSpec/InferredSpecType cop () 2023-05-04 05:49:53 +02:00
Matt Jankowski
710745e16b
Fix RSpec/ContextWording cop () 2023-05-04 05:49:08 +02:00
Matt Jankowski
cf18cc2891
Fix RSpec/MultipleSubjects cop () 2023-05-04 05:48:35 +02:00
Matt Jankowski
2c6c398c60
Fix Performance/CollectionLiteralInLoop cop () 2023-05-04 05:33:55 +02:00
Matt Jankowski
d9a958fcf7
Fix Performance/RedundantMerge cop () 2023-05-04 05:25:43 +02:00
Matt Jankowski
3df665fd23
Fix Lint/ConstantDefinitionInBlock cop () 2023-05-03 10:32:30 +02:00
Matt Jankowski
a0c9f2447e
Fix Performance/MethodObjectAsBlock cop () 2023-05-03 10:30:54 +02:00
Matt Jankowski
97385f27bd
Fix Performance/RedundantEqualityComparisonBlock cop () 2023-05-03 10:30:10 +02:00
Matt Jankowski
668a19a2f3
Fix Performance/DeletePrefix cop () 2023-05-02 21:07:45 +02:00
Matt Jankowski
05e3abe9d9
Fix Lint/EmptyClass cop () 2023-05-02 21:06:51 +02:00
Matt Jankowski
24491abf6d
Fix Rails/DeprecatedActiveModelErrorsMethods cop () 2023-05-02 18:39:22 +02:00
Matt Jankowski
b5c4b47746
Fix Rails/ActiveRecordCallbacksOrder cop () 2023-05-02 18:23:35 +02:00
Matt Jankowski
38b2974a83
Extract AccountSearch concern from Account () 2023-05-02 18:21:36 +02:00
Matt Jankowski
f1c1dd0118
Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method () 2023-05-02 18:16:07 +02:00
Matt Jankowski
570079f8ce
Fix Performance/TimesMap cop () 2023-05-02 18:07:16 +02:00
Matt Jankowski
bae694108a
Fix Performance/Count cop () 2023-05-02 18:06:43 +02:00
Matt Jankowski
5e060e1f44
Fix Performance/Sum cop () 2023-05-02 16:10:40 +02:00
Matt Jankowski
88d33f361f
Fix Lint/DuplicateBranch cop () 2023-05-02 12:57:11 +02:00
Claire
32a030dd74
Rewrite import feature () 2023-05-02 12:08:48 +02:00
Matt Jankowski
c53fe9b753
Fix RSpec/BeforeAfterAll cop () 2023-05-01 04:16:08 +09:00
Matt Jankowski
d902a707a3
Fix Rails/CompactBlank cop () 2023-04-30 14:07:21 +02:00
Matt Jankowski
d00e45a7d3
Fix Rails/I18nLocaleAssignment cop () 2023-04-30 14:07:03 +02:00