0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
0e7466717f
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
2023-05-28 16:41:14 +02:00
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +02:00
0f2c16ac4b
Fix RSpec/NoExpectationExample cop ( #25103 )
2023-05-26 09:41:12 +02:00
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
2023-05-25 23:47:28 +02:00
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
2023-05-25 22:59:30 +02:00
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
d2e5430d4a
Fix RSpec/ExpectChange cop ( #25101 )
2023-05-24 11:23:40 +02:00
b896b16cb3
Fix RSpec/PredicateMatcher cop ( #25102 )
2023-05-23 16:49:11 +02:00
778e4a7bf7
Fix RSpec/ExpectInHook cop ( #25100 )
2023-05-23 16:40:21 +02:00
b6b4ea4ca5
Move the mastodon/*_cli files to mastodon/cli/* ( #24139 )
2023-05-23 16:08:26 +02:00
541f64b2bb
Fix Rails/Exit cop ( #24743 )
2023-05-23 13:26:10 +02:00
e387175fc9
Fix RSpec/RepeatedExample cop ( #24849 )
2023-05-23 10:49:23 +02:00
9f5deb310b
Fix Performance/MapCompact cop ( #24797 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-23 10:49:12 +02:00
0664704cd9
Fix Performance/StartWith cop ( #24818 )
2023-05-23 10:16:50 +02:00
325d5f0183
Regenerate rubocop-todo ( #24846 )
2023-05-22 14:49:10 +02:00
c0b9664a31
Autofix Rubocop spacing in config ( #25022 )
2023-05-22 13:17:56 +02:00
cee4369cf5
Autofix Rubocop Lint/AmbiguousOperatorPrecedence ( #25002 )
2023-05-16 10:51:59 +02:00
2c2d924942
Fix RSpec/RepeatedExampleGroupDescription cop ( #24850 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-12 12:25:32 +02:00
bf3ebeb42f
Fix RSpec/SharedContext cop ( #24847 )
2023-05-12 09:25:43 +02:00
a610a02d4f
Fix RSpec/ScatteredSetup cop ( #24848 )
2023-05-11 10:32:09 +02:00
8b31030fe4
Fix rubocop issues in glitch-soc-specific code
2023-05-08 19:28:43 +02:00
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
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
9b59748679
Fix rubocop warnings ( #2206 )
2023-05-07 15:06:15 +02:00
0b249ebdb0
Extract StatusSafeReblogInsert concern from Status ( #24821 )
2023-05-04 14:06:20 +02:00
569b39256b
Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml ( #24469 )
2023-05-04 11:56:24 +02:00
e1ebcc007d
Regenerate rubocop-todo ( #24834 )
2023-05-04 07:43:54 +02:00
ff3b7069cf
Autofix Rubocop Style/ConcatArrayLiterals ( #23755 )
2023-05-04 05:57:40 +02:00
da3bd913ae
Autofix Rubocop Style/HashSyntax ( #23754 )
2023-05-04 05:54:26 +02:00
d5a185d721
Autofix Rubocop Style/CaseLikeIf ( #23756 )
2023-05-04 05:51:18 +02:00
1fe04f740a
Enable Rubocop Rails/FilePath ( #23854 )
2023-05-04 05:50:40 +02:00
c97b611b6b
Fix RSpec/InferredSpecType cop ( #24736 )
2023-05-04 05:49:53 +02:00
710745e16b
Fix RSpec/ContextWording cop ( #24739 )
2023-05-04 05:49:08 +02:00
cf18cc2891
Fix RSpec/MultipleSubjects cop ( #24738 )
2023-05-04 05:48:35 +02:00
2c6c398c60
Fix Performance/CollectionLiteralInLoop cop ( #24819 )
2023-05-04 05:33:55 +02:00
d9a958fcf7
Fix Performance/RedundantMerge cop ( #24817 )
2023-05-04 05:25:43 +02:00
3df665fd23
Fix Lint/ConstantDefinitionInBlock cop ( #24763 )
2023-05-03 10:32:30 +02:00
a0c9f2447e
Fix Performance/MethodObjectAsBlock cop ( #24798 )
2023-05-03 10:30:54 +02:00
97385f27bd
Fix Performance/RedundantEqualityComparisonBlock cop ( #24799 )
2023-05-03 10:30:10 +02:00
668a19a2f3
Fix Performance/DeletePrefix cop ( #24796 )
2023-05-02 21:07:45 +02:00
05e3abe9d9
Fix Lint/EmptyClass cop ( #24795 )
2023-05-02 21:06:51 +02:00
24491abf6d
Fix Rails/DeprecatedActiveModelErrorsMethods cop ( #24742 )
2023-05-02 18:39:22 +02:00
b5c4b47746
Fix Rails/ActiveRecordCallbacksOrder cop ( #24689 )
2023-05-02 18:23:35 +02:00
38b2974a83
Extract AccountSearch concern from Account ( #24716 )
2023-05-02 18:21:36 +02:00
f1c1dd0118
Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method ( #24741 )
2023-05-02 18:16:07 +02:00
570079f8ce
Fix Performance/TimesMap cop ( #24789 )
2023-05-02 18:07:16 +02:00
bae694108a
Fix Performance/Count cop ( #24793 )
2023-05-02 18:06:43 +02:00
5e060e1f44
Fix Performance/Sum cop ( #24788 )
2023-05-02 16:10:40 +02:00
88d33f361f
Fix Lint/DuplicateBranch cop ( #24766 )
2023-05-02 12:57:11 +02:00
32a030dd74
Rewrite import feature ( #21054 )
2023-05-02 12:08:48 +02:00
c53fe9b753
Fix RSpec/BeforeAfterAll cop ( #24737 )
2023-05-01 04:16:08 +09:00
d902a707a3
Fix Rails/CompactBlank cop ( #24690 )
2023-04-30 14:07:21 +02:00
d00e45a7d3
Fix Rails/I18nLocaleAssignment cop ( #24693 )
2023-04-30 14:07:03 +02:00
af824db398
Fix Rails/InverseOf cop ( #24732 )
2023-04-30 14:06:53 +02:00
2e43461100
Fix Rails/Output cop ( #24687 )
2023-04-30 06:48:16 +02:00
5a2aa06a51
Fix Rails/Present cop ( #24688 )
2023-04-30 06:47:50 +02:00
bdc74086e6
Fix Rails/ContentTag cop ( #24691 )
2023-04-30 06:47:15 +02:00
6e226f5a32
Fix Rails/ActionOrder cop ( #24692 )
2023-04-30 06:46:39 +02:00
60ac9e8634
Fix Rails/SquishedSQLHeredocs cop ( #24694 )
2023-04-30 06:43:50 +02:00
8dcfb6e0ea
Fix Rails/HttpPositionalArguments cop ( #24699 )
2023-04-30 06:43:28 +02:00
4cfe52635c
Add pending spec for User.those_who_can ( #24724 )
2023-04-29 22:03:36 +02:00
12b935fadf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, removed in glitch-soc to disable noise.
Kept removed.
- `CODE_OF_CONDUCT.md`:
Upstream updated to a new version of the covenant, but I have not read it
yet, so kept unchanged.
- `Gemfile.lock`:
Not a real conflict, one upstream dependency updated textually too close to
the glitch-soc only `hcaptcha` dependency.
Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/helpers/application_helper.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream added a highlight animation for onboarding, while we changed the
max character limit.
Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `stylelint.config.js`:
Upstream added ignore paths, glitch-soc had extra ignore paths.
Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
49fad26eca
Drop EOL Ruby 2.7 ( #24237 )
2023-04-27 01:46:18 +02:00
5841f1af8c
Autofix Rubocop RSpec/MatchArray ( #24675 )
2023-04-26 21:29:36 +02:00
a3393d0d07
Autofix Rubocop RSpec/MatchArray ( #24050 )
2023-04-26 20:21:54 +02:00
90beba57d8
Autofix Rubocop Rails/ResponseParsedBody ( #24051 )
2023-04-26 17:25:07 +02:00
0a5f0a8b20
Remove instance variables from helper usage ( #24203 )
2023-04-23 22:35:54 +02:00
4687967176
Autofix Rubocop Style/NumericLiterals ( #24468 )
2023-04-23 22:30:07 +02:00
e98c86050a
Refactor `Cache-Control` and `Vary` definitions ( #24347 )
2023-04-19 16:07:29 +02:00
ff168ef202
Fix most rubocop issues ( #2165 )
...
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues
2023-04-09 11:25:30 +02:00
cb2ce842b0
Autofix Rubocop Rails/IgnoredColumnsAssignment ( #23761 )
2023-03-31 15:07:22 +02:00
500d6f93be
Autofix Rubocop Style/IdenticalConditionalBranches ( #24322 )
2023-03-31 09:33:52 +02:00
83fc97285b
Enable Rubocop Metrics/BlockLength with Excludes ( #24260 )
2023-03-31 09:33:25 +02:00
a9b5598c97
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00
503022d6f9
Exclude files for Rubocop Metrics/ClassLength ( #24213 )
2023-03-23 23:19:41 +01:00
7bef11630d
Remove references to non-existent actions ( #24183 )
2023-03-20 20:03:44 +01:00
94cbd808b5
Webhooks for local status.create, status.update, account.update ( #24133 )
2023-03-19 07:47:54 +01:00
b22b4bac03
Include config/ and update all rubcop deps ( #23963 )
2023-03-17 10:13:28 +01:00
681dcd3fa3
Ignore additional Style/OptionalBooleanParameter ( #24138 )
2023-03-16 23:07:25 +01:00
edc7ca5920
Roll back unintentionally activated rubocop rules ( #24132 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-03-16 22:24:01 +01:00
bd047acc35
Replace `Status#translatable?` with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
aa947a143b
Regen rubocop-todo without Max shadowing ( #24076 )
2023-03-16 12:31:08 +09:00
25d36b6edd
Autofix Rubocop Style/RedundantArgument ( #23798 )
2023-03-16 10:34:00 +09:00
a38f67c1c3
Autofix Rubocop Style/PreferredHashMethods ( #23851 )
2023-03-16 01:36:37 +01:00
e762a14c0a
Enable Rubocop Performance/DeleteSuffix ( #24077 )
2023-03-13 00:03:07 +01:00
3ea0856f70
Enable RSpec/FilePath ( #23965 )
2023-03-10 16:32:37 +01:00
688287c59d
Coverage improvement round-out following up previous work ( #23987 )
2023-03-10 13:33:30 +01:00
56bddfbfa3
Serializers spec coverage ( #24017 )
2023-03-10 12:12:51 +01:00
aa98c8fbeb
Disable Style/SymbolArray ( #23921 )
2023-03-03 22:55:43 +01:00
56489cdc4f
Autofix Rubocop Style/HashConversion ( #23852 )
2023-02-28 22:59:19 +09:00
730bb3e211
Remove unused HTML Validator ( #23866 )
2023-02-24 20:06:32 +01:00
19614ba247
Rename ActivityPub Serializer Specs ( #23844 )
2023-02-23 23:17:48 +01:00
6bd7003799
Fix mispelled spec filenames ( #23834 )
2023-02-23 11:28:56 +01:00
4ff44be134
Autofix Rubocop Rails/Blank ( #23765 )
2023-02-22 09:57:56 +09:00
8fd3fc404d
Autofix Rubocop Rails/RootPathnameMethods ( #23760 )
2023-02-22 09:57:15 +09:00
0cfdd1a401
Enable Rubocop Style/StringConcatenation defaults ( #23792 )
2023-02-22 09:54:36 +09:00
434770f580
Autofix Rubocop Rails/FindById ( #23762 )
2023-02-21 10:21:48 +09:00
35d032500b
Autofix Rubocop Security/IoMethods ( #23757 )
2023-02-21 03:21:19 +09:00
9909b4b653
Autofix Rubocop Rails/WhereEquals ( #23759 )
2023-02-21 03:20:56 +09:00
59c8d43d94
Autofix Rubocop Style/RescueStandardError ( #23745 )
2023-02-20 11:01:20 +01:00
2c3c734bcc
Autofix Rubocop Style/SymbolProc ( #23742 )
2023-02-20 07:58:46 +01:00
af4c95100c
Autofix Rubocop Style/FormatString ( #23743 )
2023-02-20 07:58:33 +01:00
717683d1c3
Autofix Rubocop remaining Layout rules ( #23679 )
2023-02-20 06:58:28 +01:00
d2dcb6c45a
Autofix Rubocop Style/UnpackFirst ( #23741 )
2023-02-20 06:51:43 +01:00
5116347eb7
Autofix Rubocop RSpec/BeEq ( #23740 )
2023-02-20 06:14:50 +01:00
bf785df9fe
Audofix Rubocop Style/WordArray ( #23739 )
2023-02-20 06:14:10 +01:00
4552685f6b
Autofix Rubocop RSpec/LeadingSubject ( #23670 )
2023-02-20 13:24:14 +09:00
4ea1e0fceb
Enable Rubocop RSpec/ExpectActual ( #23720 )
2023-02-20 05:00:59 +01:00
38a1d8bb85
Autofix Rubocop RSpec/ImplicitSubject ( #23721 )
2023-02-20 05:00:48 +01:00
63e6353886
Autofix Rubocop Rails/EnumHash ( #23737 )
2023-02-20 05:00:36 +01:00
f0e1b12c10
Autofix Rubocop Style/ExplicitBlockArgument ( #23704 )
2023-02-20 11:18:08 +09:00
5179c47087
Autofix Rubocops RSpec/ScatteredLet ( #23725 )
2023-02-20 11:17:41 +09:00
aef0051fd0
Enable Rubocop HTTP status rules ( #23717 )
2023-02-20 11:16:40 +09:00
bd1d57c230
Autofix Rubocop RSpec/EmptyLineAfterSubject ( #23719 )
2023-02-20 02:46:00 +01:00
dbc6d7b276
Autofix Rubocop Lint/UnusedBlockArgument ( #23712 )
2023-02-20 02:45:50 +01:00
65ba0d92ef
Enable Rubocop RSpec/NotToNot ( #23723 )
2023-02-20 02:33:27 +01:00
a2fdb388eb
Autofix Rubocop RSpec/ReturnFromStub ( #23724 )
2023-02-20 02:32:10 +01:00
21bf326356
Autofix Rubocop Rails/Pluck ( #23730 )
2023-02-20 02:28:40 +01:00
597767a9f7
Autofix Rubocop Rails/RedundantForeignKey ( #23731 )
2023-02-20 02:19:40 +01:00
8ef09813a2
Autofix Rubocop Style/EmptyMethod ( #23732 )
2023-02-20 02:18:54 +01:00
e0e63b73ee
Autofix Rubocop RSpec/EmptyLineAfterHook ( #23718 )
2023-02-19 14:54:34 +09:00
81ad6c2e39
Autofix Rubocop Style/StringLiterals ( #23695 )
2023-02-19 07:38:14 +09:00
ac3561098e
Autofix Rubocop RSpec/LetBeforeExamples ( #23671 )
2023-02-19 07:17:59 +09:00
1a02101100
Autofix Rubocop Style/EmptyLambdaParameter ( #23705 )
2023-02-19 07:12:06 +09:00
3680e032b4
Autofix Rubocop RSpec/EmptyLineAfterFinalLet ( #23707 )
2023-02-19 07:10:19 +09:00
2177daeae9
Autofix Rubocop Style/RedundantBegin ( #23703 )
2023-02-19 07:09:40 +09:00
167709f6b0
Autofix Rubocop Style/BlockDelimiters ( #23706 )
2023-02-19 07:00:17 +09:00
c0d7c855b3
Autofix Rubocop RSpec/Capybara/FeatureMethods ( #23708 )
2023-02-19 06:59:00 +09:00
08289a38fa
Autofix Rubocop Style/TrailingCommaInArrayLiteral ( #23692 )
2023-02-19 06:54:30 +09:00
5069769cbe
Autofix Rubocop Style/TrailingCommaInHashLiteral ( #23693 )
2023-02-18 23:33:41 +09:00
b4cbfff3eb
Autofix Rubocop RSpec/ExcessiveDocstringSpacing ( #23666 )
2023-02-18 12:47:37 +01:00
c38bd17657
Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )
2023-02-18 12:39:58 +01:00
ab7816a414
Autofix Rubocop Style/Lambda ( #23696 )
2023-02-18 12:39:00 +01:00
e2a3ebb271
Autofix Rubocop Style/IfUnlessModifier ( #23697 )
2023-02-18 12:37:47 +01:00
8aee4de034
Autofix Rubocop Style/PerlBackrefs ( #23649 )
2023-02-18 14:20:20 +09:00
a6f77aa28a
Autofix Rubocop Lint/AmbiguousOperatorPrecedence ( #23681 )
2023-02-18 04:30:23 +01:00
e2567df860
Enable Lint/RedundantCopDisableDirective ( #23687 )
2023-02-18 04:30:14 +01:00
d65b2c1924
Apply Rubocop Style/RedundantConstantBase ( #23463 )
2023-02-18 04:30:03 +01:00
a7db0b41cd
Autofix Rubocop Lint/ParenthesesAsGroupedExpression ( #23682 )
2023-02-18 04:00:05 +01:00
e5cf23cf3a
Enable Rubocop RSpec/HooksBeforeExamples ( #23668 )
2023-02-18 03:59:57 +01:00
efd424506a
Autofix Rubocop Style/RedundantPercentQ ( #23651 )
2023-02-18 03:32:57 +01:00
c0a645f647
Autofix Rubocop RSpec/ExampleWording ( #23667 )
2023-02-18 03:26:20 +01:00
7a3d4c3d4b
Enable Rubocop RSpec/MultipleDescribes ( #23672 )
2023-02-18 03:25:47 +01:00
54318dcd6d
Autofix Rubocop RSpec/ClassCheck ( #23685 )
2023-02-18 03:24:16 +01:00
634368c491
Autofix Rubocop Lint/SymbolConversion ( #23683 )
2023-02-18 03:23:49 +01:00
6d42820e5d
Autofix Rubocop Lint/AmbiguousOperator ( #23680 )
2023-02-18 03:22:01 +01:00
ac59d6f19f
Enable Rubocop Style/NumericLiterals ( #23647 )
2023-02-18 11:05:57 +09:00
669f6d2c0a
Run rubocop formatting except line length ( #23632 )
2023-02-18 06:56:20 +09:00
593bb8ce99
Autofix Rubocop Style/RaiseArgs ( #23650 )
2023-02-17 22:47:23 +09:00
Claire
Matt Jankowski
Nick Schonning
Eugen Rochko
Vyr Cossont
Christian Schmidt