Claire
f62bafc7a1
Fix HAML linting issue
2023-12-17 16:37:11 +01:00
Claire
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
Claire
b7248485b1
Merge pull request #2477 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2e6bf60f15
2023-12-12 19:45:18 +01:00
Claire
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
Claire
98f50429d5
Merge pull request #2511 from ClearlyClaire/glitch-soc/cleanup-2
...
Further reduce code differences with upstream
2023-12-10 18:03:04 +01:00
Claire
df5c64fe57
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
Claire
cc1d68ace8
[Glitch] Show announcements in reverse chronological order
...
Port f1f0400adc
and 8e2530ea16
to glitch-soc
Co-Authored-By: Darius Kazemi <darius.kazemi@gmail.com>
2023-12-09 21:19:43 +01:00
Claire
4b2ddaf106
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
Claire
408d4710ed
Further reduce differences with upstream
2023-12-09 20:58:50 +01:00
Claire
a27abb4802
Further reduce code differences with upstream ( #2509 )
2023-12-09 20:29:23 +01:00
Claire
1ddf2012ee
Fix status avatar size discrepancies ( #2510 )
...
Follow-up to #2508
2023-12-09 20:29:15 +01:00
Claire
b2647bc3f2
[Glitch] Update `Avatar`, `AvatarComposite`, and `AvatarOverlay` components ( #2508 )
...
Various ports including 8dfe5179ee
,
d1de7fb7fa
and
9f8d34620b
.
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: fusagiko / takayamaki <24884114+takayamaki@users.noreply.github.com>
2023-12-09 18:33:42 +01:00
Matt Jankowski
0b4a3a0437
Remove remaining `without_partial_double_verification` usage ( #28127 )
2023-12-07 12:15:50 +00:00
Matt Jankowski
1d7b8234c9
Remove useless `reorder(nil)` call in `tootctl statuses` ( #28141 )
2023-12-07 09:41:00 +00:00
github-actions[bot]
e0dacf6b4c
New Crowdin Translations (automated) ( #28264 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-07 09:38:44 +00:00
Claire
7593465c23
Fix error when processing link preview with an array as `inLanguage` ( #28252 )
2023-12-07 09:05:08 +00:00
renovate[bot]
336d6260ba
Update dependency chewy to v7.3.5 ( #28253 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-07 08:44:45 +00:00
renovate[bot]
54db2006a9
Update dependency sass-loader to v10.5.0 ( #28254 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-07 08:44:16 +00:00
renovate[bot]
5e8a38e254
Update dependency oj to v3.16.2 ( #28263 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-07 08:42:47 +00:00
Claire
658ad7a6ca
Fix flaky tests related to file creation ( #28248 )
2023-12-06 22:22:25 +00:00
Matt Jankowski
af66d3d836
Use `following` and `followers` scopes in CLI ( #28154 )
2023-12-06 14:15:54 +00:00
renovate[bot]
23b16aaab0
Update dependency selenium-webdriver to v4.16.0 ( #28246 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-06 13:50:59 +00:00
Matt Jankowski
ee83d5c760
Enable the eslint `react/no-unknown-property` rule ( #28217 )
2023-12-06 13:42:12 +00:00
Claire
c0e562916c
Fix glitch-soc being uninstallable because of yanked dependency ( #2507 )
2023-12-06 13:32:27 +01:00
Matt Jankowski
42afd30324
Replace Sprockets with Propshaft ( #28239 )
2023-12-06 10:19:24 +00:00
github-actions[bot]
954169966b
New Crowdin Translations (automated) ( #28245 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-06 08:52:55 +00:00
Matt Jankowski
0e8ba19113
Add spec coverage for `CLI::Emoji` class ( #28182 )
2023-12-06 08:52:30 +00:00
Matt Jankowski
ed7b5c091b
Remove double subject call in `services/delete_account_service` spec ( #28212 )
2023-12-06 08:51:09 +00:00
Matt Jankowski
be6bb1a10d
Remove double subject call in `services/suspend_account_service` spec ( #28213 )
2023-12-06 08:45:19 +00:00
Matt Jankowski
5517df61de
Remove double subject call in `services/activitypub/process_account_service` spec ( #28214 )
2023-12-06 08:44:51 +00:00
Matt Jankowski
faffd81976
Remove double subject call in `services/unsuspend_account_service` spec ( #28215 )
2023-12-06 08:44:07 +00:00
renovate[bot]
3b710b96cf
Update dependency irb to v1.10.1 ( #28240 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-06 08:33:27 +00:00
renovate[bot]
996c13a24d
Update dependency core-js to v3.34.0 ( #28241 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-06 08:33:11 +00:00
github-actions[bot]
4238ec844d
New Crowdin Translations (automated) ( #28120 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-05 16:07:53 +00:00
Jonathan de Jong
d0a5ebf914
Fix error when encountering malformed Tag objects from Kbin ( #28235 )
2023-12-05 13:59:15 +00:00
renovate[bot]
2d2e23c68d
Update dependency brakeman to v6.1.0 ( #28231 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-05 12:59:31 +00:00
renovate[bot]
f944a767c4
Update dependency json-ld to v3.3.1 ( #28229 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-05 12:57:16 +00:00
Matt Jankowski
89a8e6e622
Remove 2x double subject call in `models/form/account_batch` spec ( #28209 )
2023-12-04 15:41:43 +00:00
Matt Jankowski
71e5a16eba
Remove triple subject call in `api/v1/lists` spec ( #28210 )
2023-12-04 15:28:19 +00:00
Matt Jankowski
cca19f5fbb
Use the `Admin::ActionLog` fabricator in admin/action_logs spec ( #28194 )
2023-12-04 12:56:28 +00:00
Claire
9fcf5d4192
[Glitch] Fix emoji picker button scrolling with textarea content in single-column view ( #2501 )
...
Port bbea052935
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-04 13:30:27 +01:00
Essem
a46b6af1d6
Fix constant redirects to onboarding page ( #2505 )
2023-12-04 13:30:17 +01:00
Matt Jankowski
b3b009e6aa
Add spec coverage for `CLI::EmailDomainBlocks` commands ( #28181 )
2023-12-04 09:44:54 +00:00
renovate[bot]
829457212e
Update dependency rubocop to v1.58.0 ( #28170 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-04 09:38:49 +00:00
Claire
a2bcfeb887
Fix `Style/HashEachMethods` cop in HAML files ( #28178 )
2023-12-04 09:09:43 +00:00
Matt Jankowski
9603198982
Add spec coverage for `CLI::Domains#purge` command ( #28179 )
2023-12-04 09:09:05 +00:00
Matt Jankowski
1bf2230fd1
Add spec coverage for `CLI::Upgrade#storage_schema` command ( #28180 )
2023-12-04 09:08:47 +00:00
Matt Jankowski
19ad51253d
Prevent triple-subject run in admin/domain_blocks spec ( #28195 )
2023-12-04 09:02:40 +00:00
renovate[bot]
154fb95e44
Update dependency postcss to v8.4.32 ( #28185 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-04 08:52:53 +00:00
Matt Jankowski
d848d8d87c
Add helper methods for domains allow and export blocks files ( #28196 )
2023-12-04 08:52:21 +00:00