mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 13:33:21 -08:00
Code Issues Projects Releases Packages Wiki Activity
23,311 commits 2 branches 0 tags 263 MiB
Commit graph

304 commits

Author SHA1 Message Date
Claire
55cf5e0188 Merge commit 'c929b4cace' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
Nick Schonning
cd1bc94cd2
 		Regen RuboCop TODO for 1.65.0 (#31003) 2024-07-12 08:22:31 +00:00
Claire
3b4607991d Merge commit '4743657ba2' into glitch-soc/merge-upstream 2024-06-22 20:59:23 +02:00
Matt Jankowski
348ccf206e
 		Fix Style/ClassEqualityComparison cop (#30058) 2024-06-21 15:33:55 +00:00
Claire
fd867adffe Merge commit 'bb2d77b4a0' into glitch-soc/merge-upstream 2024-06-20 18:36:13 +02:00
Nick Schonning
6ab6146c0b
 		Remove --no-exclude-limit for RuboCop ToDo (#30427) 2024-06-20 15:30:49 +00:00
Claire
395b9011ee Merge commit 'd5f02adad7' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
 2024-06-17 18:30:28 +02:00
Matt Jankowski
ab8474fd7f
 		Fix (relax) remaining RSpec/* cops (#30693) 2024-06-14 09:49:49 +00:00
Claire
c827a98f19 Merge commit 'd20a5c3ec9' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
 2024-05-29 17:03:24 +02:00
Nick Schonning
87156f57b5
 		Enable Style/StringConcatenation (#30428) 2024-05-27 09:41:45 +00:00
Claire
2810231180 Merge commit 'b2388be71e' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.
 2024-05-16 19:30:10 +02:00
Matt Jankowski
ca560c1095
 		Disable Style/RedundantFetchBlock cop (#30207) 2024-05-15 13:57:13 +00:00
Claire
666760f450 Merge commit '1bf661cddb' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream fixed a command we have modified in glitch-soc.
  Updated as upstream did.
 2024-05-14 20:47:14 +02:00
Nick Schonning
13fb54920b
 		Enable Style/IfUnlessModifier RuboCop (#30260) 2024-05-13 09:54:15 +00:00
Claire
f35ba6963d Merge commit '1959365c2f' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
Matt Jankowski
0d397db5dd
 		Consolidate system specs into single directory, use rspec tags for configuration (#30206) 2024-05-10 12:36:09 +00:00
Matt Jankowski
040aaf3a48
 		Use default: ... assignment for Devise config, fixes Style/ClassVars cop (#30214) 2024-05-10 09:42:01 +00:00
Claire
3789d9f825 Merge commit 'b7902225d6' into glitch-soc/merge-upstream 
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests.
 2024-05-04 16:28:30 +02:00
Claire
f09f5b35f2 Merge commit 'd97d31cce6' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.

The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
 2024-05-04 16:12:51 +02:00
Claire
bac4026d80 Merge commit '85fdbd0ad5' into glitch-soc/merge-upstream 2024-05-04 15:10:54 +02:00
Matt Jankowski
88882fbbee
 		Move Rails/HABTM cop out of todo (#30118) 2024-05-02 09:40:05 +00:00
Claire
eeefb7cdbc Merge commit 'a15139bc02' into glitch-soc/merge-upstream 2024-05-01 19:42:34 +02:00
Claire
6204d13a2e Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.
 2024-05-01 19:38:34 +02:00
Claire
946bd2e7e1 Merge commit '0622107449' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Claire
3503fe1865 Merge commit '4045c069f8' into glitch-soc/merge-upstream 2024-05-01 17:26:21 +02:00
Matt Jankowski
f1a4b4e228
 		Disable Style/SignalException cop (#30064) 2024-04-29 12:32:06 +00:00
Matt Jankowski
b903e6909e
 		Disable Style/HashAsLastArrayItem cop (#30041) 2024-04-24 08:32:18 +00:00
Matt Jankowski
2ec9bff36e
 		Fix Rubocop Rails/UniqueValidationWithoutIndex cop (#27461) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-22 08:04:05 +00:00
Matt Jankowski
369b2ef0ed
 		Fix Style/TrailingCommaInHashLiteral cop (#30004) 2024-04-19 20:52:01 +00:00
Matt Jankowski
c7384adc00
 		Fix Style/TrailingCommaInArguments cop (#30003) 2024-04-19 20:37:18 +00:00
Matt Jankowski
933189887b
 		Fix Style/StringLiterals cop (#30005) 2024-04-19 20:33:00 +00:00
Matt Jankowski
8d47ba893a
 		Fix Style/PercentLiteralDelimiters cop (#30006) 2024-04-19 20:32:26 +00:00
Matt Jankowski
75f9c652e2
 		Fix Bundler/OrderedGems cop (#28400) 2024-04-18 16:24:22 +00:00
Matt Jankowski
0d9ad96d3f
 		Rename PremailerWebpackStrategy -> PremailerBundledAssetStrategy (#29934) 2024-04-15 09:16:59 +00:00
Matt Jankowski
bf5d948237
 		Fix Style/SingleArgumentDig cop in webpacker/manifest_extensions (#29929) 2024-04-15 09:15:32 +00:00
Matt Jankowski
a7b637768e
 		Regenerate rubocop todo with version 1.62.1 (#29830) 2024-04-02 19:56:54 +00:00
Claire
ef3d15554b Merge commit 'c645490d55' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
 2024-02-24 14:46:14 +01:00
Claire
ab2f0daa10 Merge commit 'aaa58d4807' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-security.yml`:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
 2024-02-24 14:27:43 +01:00
Matt Jankowski
79b4b94f3a
 		Configure CountAsOne value for RSpec/ExampleLength cop (#29115) 2024-02-07 14:54:40 +00:00
Matt Jankowski
978fdc71ca
 		Reduce expectation count in example from ProcessAccountService spec (#29100) 2024-02-06 13:04:02 +00:00
Claire
bf153b384b Merge commit '42ab855b23' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
 2024-01-27 19:06:41 +01:00
Claire
5fa2821853 Merge commit '3205a654ca' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
Claire
70de52c297 Merge commit '7a1f087659' into glitch-soc/merge-upstream 2024-01-25 19:51:19 +01:00
Matt Jankowski
17ea22671d
 		Fix Style/GuardClause cop in app/controllers (#28420) 2024-01-25 15:13:41 +00:00
Matt Jankowski
c8f59d2ca4
 		Fix Style/TernaryParentheses cop (#28387) 2024-01-25 13:28:49 +00:00
Matt Jankowski
7c9c6c7f80
 		Fix remaining Rails/WhereExists cop violations, regenerate todo (#28892) 2024-01-25 12:37:07 +00:00
Claire
22cfab0ebf Merge commit '01ce9df880' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
 2024-01-24 20:42:53 +01:00
Matt Jankowski
1290fede65
 		Fix Rails/WhereExists cop in app/lib (#28862) 2024-01-24 11:51:09 +00:00
Matt Jankowski
9d413cbaf8
 		Fix Rails/WhereExists cop in app/models (#28863) 2024-01-24 09:57:49 +00:00
Matt Jankowski
ceade78182
 		Fix Rails/WhereExists cop in app/services (#28853) 2024-01-23 11:41:34 +00:00