Essem
a7b905d573
Merge remote-tracking branch 'upstream/main'
2024-05-02 23:31:54 -05:00
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
946bd2e7e1
Merge commit ' 0622107449' into glitch-soc/merge-upstream
2024-05-01 19:16:48 +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
Emelia Smith
049b159beb
Add read:me OAuth 2.0 scope, allowing more limited access to user data ( #29087 )
2024-04-23 11:47:00 +00:00
Tim Rogers
1ca6ff8ca5
Fixed crash when supplying FFMPEG_BINARY environment variable ( #30022 )
2024-04-22 09:00:24 +00:00
Matt Jankowski
c7384adc00
Fix Style/TrailingCommaInArguments cop ( #30003 )
2024-04-19 20:37:18 +00:00
Matt Jankowski
933189887b
Fix Style/StringLiterals cop ( #30005 )
2024-04-19 20:33:00 +00:00
Matt Jankowski
8d47ba893a
Fix Style/PercentLiteralDelimiters cop ( #30006 )
2024-04-19 20:32:26 +00:00
Matt Jankowski
828299e71c
Enable AR Encryption ( #29831 )
2024-04-17 09:19:02 +00:00
Matt Jankowski
0d9ad96d3f
Rename PremailerWebpackStrategy -> PremailerBundledAssetStrategy ( #29934 )
2024-04-15 09:16:59 +00:00
Essem
ce98ee9b00
Merge remote-tracking branch 'upstream/main'
2024-04-10 17:36:38 -05:00
Claire
903dc53522
Merge commit ' 05eda8d193' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
Matt Jankowski
edde54e991
Update stoplight to version 4.1.0 ( #28366 )
2024-04-02 15:47:40 +00:00
Matt Jankowski
a59f5694fe
Add empty line after ✨ magic ✨ frozen string comment ( #29696 )
2024-03-21 14:12:50 +00:00
Essem
aaf54c6395
Merge remote-tracking branch 'upstream/main'
2024-03-20 16:41:33 -05:00
Claire
876aa35350
Merge commit ' ffc5be4820' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
- `yarn.lock`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
2024-03-19 19:21:12 +01:00
Matt Jankowski
6c68c3c0ce
Introduce inline_svg gem, minimal usage, prep for material design icons ( #29612 )
2024-03-19 09:03:15 +00:00
Essem
fd1f0891d9
Merge remote-tracking branch 'upstream/main'
2024-03-14 20:36:26 -05: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
Essem
32308b6536
Merge remote-tracking branch 'upstream/main'
2024-03-09 18:22:55 -06:00
Claire
45e56db8e4
Merge commit ' f89512fbed' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept our version.
2024-03-05 16:25:50 +01:00
Dave MacLeod
b6b94c971f
Add Interlingue to available_locales ( #28630 )
2024-03-01 17:51:22 +00:00
Essem
fd6bd9c87b
Merge remote-tracking branch 'upstream/main'
2024-02-25 12:15:38 -06: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
Essem
76f1b63b71
Merge remote-tracking branch 'upstream/main'
2024-02-13 20:40:03 -06:00
Emelia Smith
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 20:03:00 +01:00
Emelia Smith
46142cdbdd
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 18:11:47 +00:00
Claire
8125dae5a8
Rename ES_CA_CERT to ES_CA_FILE for consistency ( #29147 )
2024-02-12 09:54:06 +00:00
Claire
2912829411
Add support for specifying custom CA cert for Elasticsearch ( #29122 )
2024-02-07 12:09:43 +00:00
Essem
9e06c87265
Merge remote-tracking branch 'upstream/main'
2024-02-06 16:56:05 -06:00
Claire
19f1ffe287
Fix self-destruct schedule not actually replacing initial schedule ( #29049 )
2024-02-06 21:00:09 +01:00
Claire
64300e0fe3
Fix self-destruct schedule not actually replacing initial schedule ( #29049 )
2024-02-06 15:32:09 +00:00
Essem
adfa7877c3
Merge remote-tracking branch 'upstream/main'
2024-01-18 18:15:06 -06:00
Claire
c59fb65ddc
Merge commit ' 127503eb2c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
Matt Jankowski
c523a9601b
Rename local webpack* var in development env CSP config ( #28766 )
2024-01-17 09:22:16 +00:00
Matt Jankowski
0ce081fe49
Remove monkey patch in favor of supported Devise config value ( #28760 )
2024-01-17 09:08:17 +00:00
Essem
d96fd9f28f
Merge remote-tracking branch 'upstream/main'
2024-01-16 13:04:33 -06:00
Claire
34c9f77b3e
Merge commit ' 7f471e70c0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/mailer.html.haml`:
Conflict caused by glitch-soc's theming system.
Used glitch-soc's path for the mailer pack.
2024-01-15 21:30:00 +01:00
HTeuMeuLeu
7f471e70c0
Update new email templates ( #28416 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online>
2024-01-15 18:18:59 +00:00
Essem
843725b25b
Merge remote-tracking branch 'upstream/main'
2024-01-11 20:51:45 -06:00
Claire
630b245bb4
Merge commit ' 9a73a7dcaf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
Claire
0b2c7cdb02
Merge commit ' fe2667bb0d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
Matt Jankowski
4e02838832
Enable "low risk" Rails 7.1 setting defaults ( #28626 )
2024-01-09 12:50:57 +00:00
gunchleoc
173953c23e
Fix ISO code for Canadian French ( #26015 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 10:56:13 +00:00
Matt Jankowski
e09419f22a
Move old framework defaults file to regular config value ( #28623 )
2024-01-08 10:17:38 +00:00
Matt Jankowski
a27a82939d
Remove the 7.1 marshalling format "todo" from new_framework_defaults ( #28625 )
2024-01-08 10:16:33 +00:00
