Claire
6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while glitch-soc
has a different version of the file overall.
Added upstream's changes.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
Claire
6ff1954bdb
Change Active Record Encryption variable check to check for emptiness ( #32537 )
2024-10-16 08:43:45 +00:00
Claire
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
Claire
ffa1032381
Add further warnings about encryption secrets ( #32476 )
2024-10-14 13:00:20 +00:00
Claire
c574f5b53f
Change how migrations duplicated between glitch and upstream are handled ( #2878 )
2024-10-09 18:36:19 +02:00
Claire
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
Emelia Smith
454d21ab5a
Remove OAuth Password Grant Type support ( #30960 )
2024-10-01 09:56:58 +00:00
Claire
9af9ef6fb3
Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream
2024-09-30 13:04:19 +02:00
Claire
e22eff8900
Remove regexp timeout feature ( #32169 )
2024-09-30 09:41:06 +00:00
Claire
c6039f99ce
Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream
2024-09-24 19:34:30 +02:00
David Roetzel
cfb8fc6222
Increase regexp timeout and allow override ( #32056 )
2024-09-24 13:16:58 +00:00
Claire
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
Tim Campbell
11eae691ba
Feature more otel customization ( #31998 )
2024-09-23 08:55:35 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
Claire
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
Claire
d5cf27e667
Add global Regexp timeout ( #31928 )
2024-09-16 09:40:18 +00:00
Claire
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
Claire
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
Claire
a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive ( #26897 )
2024-09-12 13:24:19 +00:00
Eugen Rochko
24ef8255b3
Change design of embed modal in web UI ( #31801 )
2024-09-12 12:54:16 +00:00
Claire
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
Matt Jankowski
b530fc5267
Update rails to version 7.1.4 ( #31563 )
2024-09-06 15:22:35 +00:00
Claire
5a55180b95
Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
glitch-soc had differences in the first few tests because of the wider
subset of HTML it accepts.
Changed `describe` to `RSpec.describe` as upstream did, keeping
glitch-soc's tests.
2024-09-04 19:38:52 +02:00
Claire
ee55d20fd5
Allow POST /oauth/revoke through CORS ( #31743 )
2024-09-04 10:46:28 +00:00
Claire
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
David Roetzel
388d5473e1
Refactor (ruby) redis configuration ( #31694 )
2024-09-02 14:19:55 +00:00
Claire
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
Matt Jankowski
85e8d1f285
Use rails configuration storage for paperclip path ( #31651 )
2024-08-30 09:46:09 +00:00
Claire
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
Matt Jankowski
6ec768668e
Remove nsa statsd integration (replaced by OpenTelemetry) ( #30240 )
2024-08-22 20:28:54 +00:00
Claire
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
Matt Jankowski
02df1b4e4a
Finish email allow/deny list naming migration ( #30530 )
2024-08-13 07:37:32 +00:00
Claire
83480df820
Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added `<s>` to the list of allowed tags, the conflict is because
we have a different list of allowed tags.
Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
Emelia Smith
a1f723a6a4
Add support for PKCE Extension in OmniAuth OIDC ( #31131 )
2024-08-12 14:32:52 +00:00
Claire
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
Claire
eaedd52def
Fix incorrect rate limit on PUT requests ( #31356 )
2024-08-09 14:48:05 +00:00
Claire
cf5d2c3fe4
Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream
2024-07-25 17:47:02 +02:00
Adam Niedzielski
887e64efd4
Allow @ at the end of an URL ( #31124 )
2024-07-25 15:02:58 +00:00
Claire
52fb4f16ef
Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream
2024-07-10 16:58:06 +02:00
Renaud Chaput
36592d10aa
Change Sidekiq readiness file to use an environment variable ( #30988 )
2024-07-10 12:57:25 +00:00
Claire
388672ff0d
Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream
2024-07-09 20:39:09 +02:00
Renaud Chaput
7542a134d5
Add a file for Sidekiq to signal it is ready to process jobs ( #30971 )
2024-07-09 10:47:08 +00:00
Claire
11dd51ef44
Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream and glitch-soc had different comments, some comments got updated upstream.
Updated them in glitch-soc accordingly.
2024-07-06 21:02:42 +02:00
Claire
8de5df225e
Change instructions to use bundle exec rails instead of rake ( #30917 )
2024-07-05 08:54:45 +00:00
Claire
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
Matt Jankowski
bc3737f0c3
Add detail about running version on vips error failure ( #30858 )
2024-06-27 16:27:42 +00:00
Claire
b15a3614dc
Stub Vips::Error when not using libvips ( #30857 )
2024-06-27 15:25:27 +00:00
Claire
6f2771cb32
Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream
2024-06-25 17:57:39 +02:00
Renaud Chaput
845fe1c693
Add the Interlingua locale ( #30828 )
2024-06-25 14:05:24 +00:00
