Claire
3598c2e1db
Revert "Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )" ( #28251 )
2023-12-19 05:08:52 +00:00
Renaud Chaput
8b1eeb2f90
Fix the loading bar with the new Redux actions ( #28422 )
2023-12-18 23:19:27 +00:00
Matt Jankowski
7cfc078198
Fix rails mailer preview not honouring locale ( #28418 )
2023-12-18 21:49:17 +00:00
Brian Holley
4259f4a4aa
[Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists
...
Port 4aa06cbdbf
2023-12-18 20:59:33 +01:00
Claire
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
pajowu
6261db2a26
[Glitch] Fix modal content not being selectable
...
Port ed79713f3a
2023-12-18 19:15:57 +01:00
Claire
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
Claire
60eb57ce1b
Fix HAML listing issue
2023-12-18 19:07:15 +01:00
Claire
f5de9fe99a
[Glitch] Allow viewing and severing relationships with suspended accounts
...
Port c451bbe249
2023-12-18 18:49:48 +01:00
Aleks Xhuvani
dee28c3fbf
[Glitch] Do not try to update an undefined video element
...
Port 7840c6b75b
2023-12-18 18:42:30 +01:00
Aleks Xhuvani
372c455218
[Glitch] Add volume saving/reuse to video player
...
Port 58f01a5c9a
2023-12-18 18:42:07 +01:00
Claire
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
2023-12-18 18:40:58 +01:00
Claire
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
Claire
cd2ee0ec5f
Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept ours.
- `yarn.lock`:
Upstream changed from yarn 1 to yarn 4, but we had some different
dependencies.
Updated to yarn 4 and re-added our dependencies.
2023-12-18 18:25:33 +01:00
Claire
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
Matt Jankowski
476d1237d4
Typo fix in json ld helper spec ( #28417 )
2023-12-18 16:47:22 +00:00
renovate[bot]
ab1201c9d9
Update dependency regenerator-runtime to v0.14.1 ( #28393 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 16:21:54 +00:00
Claire
7d9b209fe8
Fix call to inefficient delete_matched cache method in domain blocks ( #28374 )
2023-12-18 16:14:43 +00:00
Yamagishi Kazutoshi
f4b9c2ba40
Group artifact actions ( #28413 )
2023-12-18 14:02:19 +00:00
Matt Jankowski
af366f65ee
Add spec coverage for models/form/custom_emoji_batch class ( #28388 )
2023-12-18 12:41:37 +00:00
renovate[bot]
b2ca71f733
Update dependency rubocop-performance to v1.20.0 ( #28395 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 12:41:22 +00:00
Matt Jankowski
0b42cf2979
Opt out of Rails/NegateInclude cop ( #28370 )
2023-12-18 12:21:45 +00:00
Claire
3d3fa75c81
Reduce composer differences with upstream and simplify code ( #2518 )
2023-12-18 13:20:08 +01:00
Claire
18856371be
Merge pull request #2520 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to f476d9dab2
2023-12-18 13:19:45 +01:00
Matt Jankowski
1820bad646
Fix Performance/StringIdentifierArgument cop ( #28399 )
2023-12-18 10:26:09 +00:00
Matt Jankowski
2bd8d343cf
Fix Style/SoleNestedConditional and Style/IfInsideElse cops, regenerate haml todo ( #28384 )
2023-12-18 10:06:42 +00:00
Matt Jankowski
8e9e7d57d8
Opt out of Rails/UnusedIgnoredColumns cop ( #28385 )
2023-12-18 09:58:53 +00:00
Matt Jankowski
0e5b8fc46b
Fix Style/RedundantReturn cop ( #28391 )
2023-12-18 09:50:51 +00:00
Matt Jankowski
89d468ada7
Fix Style/StderrPuts cop ( #28389 )
2023-12-18 09:36:08 +00:00
Matt Jankowski
e56fb9e489
Fix Style/SymbolProc cop ( #28386 )
2023-12-18 09:32:02 +00:00
renovate[bot]
fc4eaa779a
Update dependency cssnano to v6.0.2 ( #28382 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 09:31:21 +00:00
renovate[bot]
fad7dca0e4
Update dependency prom-client to v15.1.0 ( #28394 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 09:29:41 +00:00
renovate[bot]
43f637c130
Update dependency rubocop-rails to v2.23.0 ( #28396 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 09:28:19 +00:00
renovate[bot]
287384b3bb
Update DefinitelyTyped types (non-major) ( #28407 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 09:28:10 +00:00
renovate[bot]
d099cf67c0
Update eslint (non-major) ( #28408 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-12-18 09:28:06 +00:00
github-actions[bot]
f99e05710e
New Crowdin Translations (automated) ( #28373 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-18 08:25:21 +00:00
Claire
33dd5d8179
Fix Ruby lint issues
2023-12-17 23:17:55 +01:00
Claire
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
Claire
c8fe36c349
Merge pull request #2517 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3bf896c973
2023-12-17 20:06:18 +01:00
mogaminsk
cc265f760e
[Glitch] Fix inserting emojis from emoji picker fails with TypeError
...
Port ac8e4ed38d
2023-12-17 18:03:22 +01:00
Claire
bb4fa0c374
[Glitch] Rewrite AutosuggestTextarea as Functional Component
...
Port 9c8891b39a
2023-12-17 17:59:33 +01:00
Renaud Chaput
e22c3cd768
[Glitch] Improve Babel configuration and automatically load polyfills
...
Port 0e3401bc1c
2023-12-17 17:50:31 +01:00
Claire
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
Claire
537b88330d
Merge pull request #2514 from ClearlyClaire/glitch-soc/main
...
Merge upstream changes up to a916251d8a
2023-12-17 17:42:22 +01:00
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
Matt Jankowski
b1dec09d20
Fix Style/InverseMethods cop ( #28377 )
2023-12-15 15:52:00 +00:00
Matt Jankowski
3e336fe706
Opt out of Rails/SkipsModelValidations cop in db/migrate ( #28371 )
2023-12-15 14:38:12 +00:00
Matt Jankowski
e5717c9bc6
Fix Style/Lambda cop ( #28378 )
2023-12-15 14:34:24 +00:00
Matt Jankowski
1ee8d1e50e
Assign a proc to Rack::Request.ip_filter instead of patching method ( #28380 )
2023-12-15 14:33:56 +00:00
