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
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
e56fb9e489
Fix Style/SymbolProc
cop ( #28386 )
2023-12-18 09:32:02 +00:00
Essem
bbf2dbaf56
Merge remote-tracking branch 'upstream/main'
2023-12-17 19:48:56 -06: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
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
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
Essem
00dae881c5
Merge remote-tracking branch 'upstream/main'
2023-12-12 20:30:34 -06:00
Claire
f37c93f3d7
Change cookie rotator to use SHA1 digest for new cookies ( #27392 )
2023-12-12 12:01:08 +00: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
Matt Jankowski
42afd30324
Replace Sprockets with Propshaft ( #28239 )
2023-12-06 10:19:24 +00:00
Matt Jankowski
a8473f582d
Add zeitwerk inflector for cli->CLI ( #27635 )
2023-11-30 13:55:20 +00:00
Claire
85662a5a57
Change img-src
and media-src
CSP directives to not include https:
( #28025 )
2023-11-30 13:47:01 +00:00
Essem
d58be1516f
Fix CSP for Tenor
...
Probably want to look into properly proxying it at some point.
2023-11-29 11:07:07 -06:00
Matt Jankowski
31bef99b9e
Move lib/mastodon/premailer_webpack_strategy to lib/ ( #27636 )
2023-11-29 10:08:55 +00:00
Claire
660372d130
Revert recent CSP changes ( #2485 )
...
* Revert "Fix image and media loading when using external storage server"
This reverts commit 6cfa0245ca
.
* Revert "Change glitch-soc's CSP config to match upstream's closer (#2474 )"
This reverts commit d59196e170
.
2023-11-26 15:32:35 +01:00
Claire
6cfa0245ca
Fix image and media loading when using external storage server
...
Fixes #2479
2023-11-21 13:45:29 +01:00
Claire
d59196e170
Change glitch-soc's CSP config to match upstream's closer ( #2474 )
2023-11-20 13:02:49 +01:00
Matt Jankowski
9429e30d75
Disable sidekiq unique jobs in test env ( #27737 )
2023-11-09 16:19:04 +00:00
Matt Jankowski
c875dfc90b
Fix Lint/UnusedBlockArgument
cop ( #27777 )
2023-11-09 09:43:26 +00:00
Matt Jankowski
33cc3ae8fa
Fix Style/StabbyLambdaParentheses
cop ( #27771 )
2023-11-08 12:01:18 +00:00
Matt Jankowski
02d27de5ce
Move i18n locale configuration to separate initializer ( #27571 )
2023-11-07 15:22:14 +00:00
Matt Jankowski
d6f50839e1
Fix RSpec/SpecFilePathFormat
cops ( #27730 )
2023-11-06 16:25:40 +00:00
Matt Jankowski
7ef56d6e50
Move json_ld context loaders to config/initializers
( #27590 )
2023-10-31 15:21:23 +00:00
Matt Jankowski
3107a9410c
Silence deprecation warning about secrets/credentials with Devise patch ( #27578 )
2023-10-31 11:10:15 +00:00
Matt Jankowski
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
2023-10-27 16:20:40 +00:00
Matt Jankowski
4aa05d45fc
Capture minimum postgres version 12 ( #27528 )
2023-10-26 20:35:15 +00:00
Claire
62620956d5
Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream
2023-10-25 19:59:17 +02:00
Matt Jankowski
9a3d047f3e
Run bin/rails app:update
with Rails 7.1 ( #27522 )
2023-10-25 13:56:09 +00:00
Claire
3c9c0299c0
Fix ActiveRecord::Migrator monkey-patch
2023-10-24 20:23:46 +02:00
Claire
e25cc4deb7
Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Conflict due to glitch-soc having extra navigation items for its theming
system.
Ported upstream changes.
2023-10-24 19:31:14 +02:00
Claire
57c0de949b
Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream changed how asset host CSP directives are used, and glitch-soc has
a pretty different CSP file.
It may be worth reconsidering the differences between upstream and glitch-soc
but for now, just port the change.
2023-10-24 19:17:20 +02:00
Claire
379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background ( #26439 )
2023-10-23 15:46:21 +00:00
Claire
c3e0eb3699
Change Content-Security-Policy to be tighter on media paths ( #26889 )
2023-10-23 14:27:07 +02:00
Claire
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
Matt Jankowski
bcd0171e5e
Fix Lint/UselessAssignment
cop ( #27472 )
2023-10-19 16:55:06 +02:00
Claire
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
2023-10-17 21:35:07 +02:00
Wladimir Palant
23f8e93c64
Fixes #23135 - Allow cross origin request for /nodeinfo/2.0 API ( #27413 )
2023-10-16 13:39:25 +02:00
Renaud Chaput
e0da64bb4e
Fix empty ENV variables not using default nil value ( #27400 )
2023-10-13 19:00:53 +02:00
Claire
ac2370778a
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream enforced a code style change and glitch-soc had a few different lines.
Applied upstream's code style to glitch-soc's changes.
2023-10-08 17:21:12 +02:00
Claire
d7fcd70023
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/cors.rb`:
Upstream refactored this file, and glitch-soc had local changes.
I could not find the rationale for the glitch-soc changes, so I
used upstream's version.
2023-10-08 16:41:56 +02:00
Nick Schonning
85db392464
Autofix Rubocop cops for config/ ( #24145 )
2023-10-03 15:24:12 +02:00
Matt Jankowski
56c0babc0b
Fix rubocop Layout/ArgumentAlignment
cop ( #26060 )
2023-09-28 15:48:47 +02:00
Georg Gadinger
ebd2017524
fix Content-Security-Policy when using Azure storage ( #2427 )
2023-09-26 20:09:56 +02:00
Claire
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
2023-09-21 15:12:00 +02:00
Claire
8acc75435b
Change S3 checksum mode to be disabled by default ( #27007 )
2023-09-21 14:00:51 +02:00
Claire
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00