sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity
21,581 commits 2 branches 0 tags 263 MiB
Commit graph

1,217 commits

Author SHA1 Message Date
Claire
b039e62194 Merge commit 'a2399046ca' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +02: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
360590ecd8 Merge commit 'a390299744' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
 2024-05-01 19:30:41 +02:00
Claire
946bd2e7e1 Merge commit '0622107449' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Claire
9ce82a35cb Merge commit '20b1e55f24' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
Claire
15f6d2d038 Merge commit 'd27eb181f6' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Conflict due to glitch-soc having a different default site name.
  Updated the tests as upstream did, keeping glitch-soc's default name.
 2024-05-01 17:22:02 +02:00
Claire
c3e12a4dfa Change how theme style packs are loaded 
Load the `common` style pack, and then charge the style pack for the current
skin, independent from any selected JS pack.
 2024-04-28 15:45:41 +02:00
renovate[bot]
483fabf48a
 		Update dependency http to '~> 5.2.0' (#30027) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-22 14:02:47 +00:00
Tim Rogers
1ca6ff8ca5
 		Fixed crash when supplying FFMPEG_BINARY environment variable (#30022) 2024-04-22 09:00:24 +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
828299e71c
 		Enable AR Encryption (#29831) 2024-04-17 09:19:02 +00:00
Matt Jankowski
9ae2594726
 		Add reusable duplicate ID finder methods in maintenance CLI (#28910) 2024-04-17 09:00:08 +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
4565015615
 		Fix Style/MapIntoArray cop in cli progress helper (#29884) 2024-04-10 12:46:43 +00:00
Matt Jankowski
4948a063d2
 		Use tt extension for form scaffold template (#29676) 2024-04-10 09:20:21 +00:00
Claire
777984faeb Merge commit '119c7aa0df' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
Claire
903dc53522 Merge commit '05eda8d193' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Claire
f2b23aa5f3 Merge commit '954b470fbc' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes.
 2024-04-06 19:35:21 +02:00
Matt Jankowski
edde54e991
 		Update stoplight to version 4.1.0 (#28366) 2024-04-02 15:47:40 +00:00
Claire
d71d26a3c9
 		Reattribute notification-related records if possible when merging accounts (#29694) 2024-03-22 16:21:53 +00:00
Claire
70a8fcf07d
 		Fix notification policy migration not preserving filter_private_mentions correctly (#29699) 2024-03-21 21:52:29 +00:00
Matt Jankowski
718ee72c80
 		Use db_table_exists? method in new cli/maintenance area (#29677) 2024-03-21 08:32:40 +00:00
Matt Jankowski
cdd168f5d3
 		Update enum away from deprecated (#29678) 2024-03-21 08:32:35 +00:00
Claire
44bf7b8128
 		Add notifications of severed relationships (#27511) 2024-03-20 15:37:21 +00:00
Claire
b8f476256e Merge commit 'd702a03a0c' into glitch-soc/merge-upstream 2024-03-15 22:48:04 +01:00
Matt Jankowski
4f4132f1a1
 		Add diagnostic message for failure during CLI search deploy (#29462) 2024-03-15 14:26:23 +00:00
Claire
e91ede5be6 Merge commit 'df6086d402' into glitch-soc/merge-upstream 2024-03-14 17:27:16 +01:00
Matt Jankowski
df6086d402
 		Extract file size sql calc from media storage cli (#29577) 2024-03-14 15:22:52 +00:00
Matt Jankowski
14aa7f1e15
 		Use Account.activitypub generated scope (#28157) 2024-03-14 13:19:20 +00:00
Matt Jankowski
19cbadfbd6
 		Use enum-generated scope for IpBlock in CLI (#28144) 2024-03-14 09:31:15 +00:00
Claire
a5127d0ef8 Merge commit '24319836de' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
 2024-03-11 17:29:07 +01:00
Matt Jankowski
a38e424185
 		Use unchanging github links in docs/comments (#29545) 2024-03-11 15:14:55 +00:00
Claire
2dc244784c Merge commit 'cfa71a4d16' into glitch-soc/merge-upstream 2024-02-24 15:43:15 +01: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
5b9ddfcfcc Merge commit 'fa0ba67753' into glitch-soc/merge-upstream 2024-02-24 14:18:16 +01:00
Claire
20615a516d Merge commit '805dba7f8d' into glitch-soc/merge-upstream 2024-02-24 13:53:59 +01:00
Claire
cfa71a4d16
 		Fix admin account created by mastodon:setup not being auto-approved (#29379) 2024-02-23 19:04:57 +00:00
Matt Jankowski
245064bb98
 		Move "everyone" role and "instance actor" account magic number IDs to constants (#29260) 2024-02-19 11:09:43 +00:00
Claire
d7d477047e Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 12:17:15 +01:00
Claire
5f21a1f5a3
 		Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 11:06:47 +00:00
Claire
40439399c6 Bump version to v4.3.0-alpha.2 (#29200) 2024-02-14 15:26:18 +01:00
Claire
8e8e0f104f
 		Bump version to v4.3.0-alpha.2 (#29200) 2024-02-14 14:20:02 +00:00
Claire
3c3ef8b9d3 Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default (#29199) 2024-02-14 13:42:15 +01:00
Claire
554e2a019e
 		Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default (#29199) 2024-02-14 12:12:13 +00:00
Claire
ff58ec0103 Merge pull request from GHSA-3fjr-858r-92rw 
* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1
 2024-02-01 15:57:08 +01:00
Claire
1726085db5
 		Merge pull request from GHSA-3fjr-858r-92rw 
* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1
 2024-02-01 15:56:46 +01:00
Matt Jankowski
adcd693b71
 		Use existing MediaAttachment.remote scope in media CLI (#28912) 2024-01-30 15:29:42 +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