1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-24 00:23:09 -05:00

93 Commits

Author SHA1 Message Date
Claire
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
Nick Schonning
49fad26eca
Drop EOL Ruby 2.7 () 2023-04-27 01:46:18 +02:00
Nick Schonning
5841f1af8c
Autofix Rubocop RSpec/MatchArray () 2023-04-26 21:29:36 +02:00
Nick Schonning
a3393d0d07
Autofix Rubocop RSpec/MatchArray () 2023-04-26 20:21:54 +02:00
Nick Schonning
90beba57d8
Autofix Rubocop Rails/ResponseParsedBody () 2023-04-26 17:25:07 +02:00
Matt Jankowski
0a5f0a8b20
Remove instance variables from helper usage () 2023-04-23 22:35:54 +02:00
Nick Schonning
4687967176
Autofix Rubocop Style/NumericLiterals () 2023-04-23 22:30:07 +02:00
Eugen Rochko
e98c86050a
Refactor Cache-Control and Vary definitions () 2023-04-19 16:07:29 +02:00
Claire
ff168ef202
Fix most rubocop issues ()
* 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
Nick Schonning
cb2ce842b0
Autofix Rubocop Rails/IgnoredColumnsAssignment () 2023-03-31 15:07:22 +02:00
Nick Schonning
500d6f93be
Autofix Rubocop Style/IdenticalConditionalBranches () 2023-03-31 09:33:52 +02:00
Nick Schonning
83fc97285b
Enable Rubocop Metrics/BlockLength with Excludes () 2023-03-31 09:33:25 +02:00
Eugen Rochko
a9b5598c97
Change user settings to be stored in a more optimal way ()
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00
Nick Schonning
503022d6f9
Exclude files for Rubocop Metrics/ClassLength () 2023-03-23 23:19:41 +01:00
Matt Jankowski
7bef11630d
Remove references to non-existent actions () 2023-03-20 20:03:44 +01:00
Vyr Cossont
94cbd808b5
Webhooks for local status.create, status.update, account.update () 2023-03-19 07:47:54 +01:00
Nick Schonning
b22b4bac03
Include config/ and update all rubcop deps () 2023-03-17 10:13:28 +01:00
Nick Schonning
681dcd3fa3
Ignore additional Style/OptionalBooleanParameter () 2023-03-16 23:07:25 +01:00
Matt Jankowski
edc7ca5920
Roll back unintentionally activated rubocop rules ()
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-03-16 22:24:01 +01:00
Christian Schmidt
bd047acc35
Replace Status#translatable? with language matrix in separate endpoint () 2023-03-16 11:07:24 +01:00
Nick Schonning
aa947a143b
Regen rubocop-todo without Max shadowing () 2023-03-16 12:31:08 +09:00
Nick Schonning
25d36b6edd
Autofix Rubocop Style/RedundantArgument () 2023-03-16 10:34:00 +09:00
Nick Schonning
a38f67c1c3
Autofix Rubocop Style/PreferredHashMethods () 2023-03-16 01:36:37 +01:00
Nick Schonning
e762a14c0a
Enable Rubocop Performance/DeleteSuffix () 2023-03-13 00:03:07 +01:00
Nick Schonning
3ea0856f70
Enable RSpec/FilePath () 2023-03-10 16:32:37 +01:00
Matt Jankowski
688287c59d
Coverage improvement round-out following up previous work () 2023-03-10 13:33:30 +01:00
Matt Jankowski
56bddfbfa3
Serializers spec coverage () 2023-03-10 12:12:51 +01:00
Claire
aa98c8fbeb
Disable Style/SymbolArray () 2023-03-03 22:55:43 +01:00
Nick Schonning
56489cdc4f
Autofix Rubocop Style/HashConversion () 2023-02-28 22:59:19 +09:00
Matt Jankowski
730bb3e211
Remove unused HTML Validator () 2023-02-24 20:06:32 +01:00
Nick Schonning
19614ba247
Rename ActivityPub Serializer Specs () 2023-02-23 23:17:48 +01:00
Nick Schonning
6bd7003799
Fix mispelled spec filenames () 2023-02-23 11:28:56 +01:00
Nick Schonning
4ff44be134
Autofix Rubocop Rails/Blank () 2023-02-22 09:57:56 +09:00
Nick Schonning
8fd3fc404d
Autofix Rubocop Rails/RootPathnameMethods () 2023-02-22 09:57:15 +09:00
Nick Schonning
0cfdd1a401
Enable Rubocop Style/StringConcatenation defaults () 2023-02-22 09:54:36 +09:00
Nick Schonning
434770f580
Autofix Rubocop Rails/FindById () 2023-02-21 10:21:48 +09:00
Nick Schonning
35d032500b
Autofix Rubocop Security/IoMethods () 2023-02-21 03:21:19 +09:00
Nick Schonning
9909b4b653
Autofix Rubocop Rails/WhereEquals () 2023-02-21 03:20:56 +09:00
Nick Schonning
59c8d43d94
Autofix Rubocop Style/RescueStandardError () 2023-02-20 11:01:20 +01:00
Nick Schonning
2c3c734bcc
Autofix Rubocop Style/SymbolProc () 2023-02-20 07:58:46 +01:00
Nick Schonning
af4c95100c
Autofix Rubocop Style/FormatString () 2023-02-20 07:58:33 +01:00
Nick Schonning
717683d1c3
Autofix Rubocop remaining Layout rules () 2023-02-20 06:58:28 +01:00
Nick Schonning
d2dcb6c45a
Autofix Rubocop Style/UnpackFirst () 2023-02-20 06:51:43 +01:00
Nick Schonning
5116347eb7
Autofix Rubocop RSpec/BeEq () 2023-02-20 06:14:50 +01:00
Nick Schonning
bf785df9fe
Audofix Rubocop Style/WordArray () 2023-02-20 06:14:10 +01:00
Nick Schonning
4552685f6b
Autofix Rubocop RSpec/LeadingSubject () 2023-02-20 13:24:14 +09:00
Nick Schonning
4ea1e0fceb
Enable Rubocop RSpec/ExpectActual () 2023-02-20 05:00:59 +01:00
Nick Schonning
38a1d8bb85
Autofix Rubocop RSpec/ImplicitSubject () 2023-02-20 05:00:48 +01:00
Nick Schonning
63e6353886
Autofix Rubocop Rails/EnumHash () 2023-02-20 05:00:36 +01:00
Nick Schonning
f0e1b12c10
Autofix Rubocop Style/ExplicitBlockArgument () 2023-02-20 11:18:08 +09:00