Jeremy Kescher
a38cc7ec83
Merge branch 'upstream-main' into develop
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Historical data migration test / test (16-alpine) (push) Has been cancelled
Historical data migration test / test (17-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (push) Has been cancelled
Ruby Testing / End to End testing (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (push) Has been cancelled
2024-11-17 00:02:19 +01:00
Claire
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
github-actions[bot]
c546aa57cb
New Crowdin Translations (automated) ( #32900 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-15 10:30:11 +00:00
Emelia Smith
ddfb3d123b
Improve display of statuses in admin panel ( #30813 )
2024-11-15 09:38:01 +00:00
github-actions[bot]
aaebf142aa
New Crowdin Translations (automated) ( #32884 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-14 09:39:33 +00:00
Jaz-Michael King
03ecf5df3b
Adds a range of reserved usernames to reduce potential misuse by malicious actors ( #32828 )
2024-11-13 13:10:01 +00:00
github-actions[bot]
baad795384
New Crowdin Translations (automated) ( #32868 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-13 09:33:02 +00:00
Matt Jankowski
ace4268308
Remove unused api/v1/polls#create route ( #32860 )
2024-11-12 17:27:23 +00:00
Claire
f5f6273d2b
Move ALLOWED_PRIVATE_ADDRESSES parsing to an initializer ( #32850 )
2024-11-12 13:00:52 +00:00
github-actions[bot]
0d06d70d11
New Crowdin Translations (automated) ( #32811 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-12 08:47:59 +00:00
Emelia Smith
a34edc211f
Add audit logging to Relays ( #32819 )
2024-11-12 08:35:08 +00:00
Matt Jankowski
c099797700
Use mastodon config namespace to load software update default value via config_for ( #30534 )
2024-11-12 08:28:31 +00:00
github-actions[bot]
d29f27fad7
New Crowdin Translations (automated) ( #2851 )
...
* New Crowdin translations
* Update simple_form.no.yml
* Update no.yml
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 22:07:04 +01:00
Emelia Smith
e22ec25077
Fix typo in account unlocked localisation ( #32821 )
2024-11-10 12:26:51 +00:00
Claire
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
Jeremy Kescher
c9f7e9454c
Merge branch 'upstream-main' into develop
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Historical data migration test / test (16-alpine) (push) Has been cancelled
Historical data migration test / test (17-alpine) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (push) Has been cancelled
Ruby Testing / End to End testing (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (push) Has been cancelled
2024-11-08 14:46:42 +01:00
github-actions[bot]
8df867b20a
New Crowdin Translations (automated) ( #32803 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-08 09:53:47 +00:00
Matt Jankowski
41227aeb95
Update Rails to version 7.2.2 ( #30391 )
2024-11-07 14:58:20 +00:00
Matt Jankowski
ae667624ac
Use with_options for shared settings options in routes ( #30847 )
2024-11-07 10:07:04 +00:00
github-actions[bot]
4ed3ce2377
New Crowdin Translations (automated) ( #32793 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-07 09:45:05 +00:00
github-actions[bot]
871e3b25e8
New Crowdin Translations (automated) ( #32782 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-06 08:21:13 +00:00
Eugen Rochko
d6349c0e9a
Add year in review feature to web UI ( #32709 )
2024-11-05 14:40:07 +00:00
David Roetzel
d60ef3f17e
Disable httplog gem in production ( #32776 )
2024-11-05 08:55:34 +00:00
github-actions[bot]
933fa81baf
New Crowdin Translations (automated) ( #32772 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-05 08:41:09 +00:00
Matt Jankowski
a139dac18e
Remove cookie rotator ( #32289 )
2024-11-04 09:11:00 +00:00
github-actions[bot]
2271b39a5c
New Crowdin Translations (automated) ( #32733 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-04 08:56:11 +00:00
Claire
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
Jeremy Kescher
7fa9c34dee
Merge branch 'upstream-main' into develop
2024-11-01 17:13:04 +01:00
github-actions[bot]
e78db58b65
New Crowdin Translations (automated) ( #32708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-31 10:01:05 +00:00
Emelia Smith
e1b7382ea6
Add userinfo oauth endpoint ( #32548 )
2024-10-30 14:38:10 +00:00
github-actions[bot]
0a599d08d8
New Crowdin Translations (automated) ( #32695 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-30 10:02:02 +00:00
github-actions[bot]
244aaf9a38
New Crowdin Translations (automated) ( #32687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-29 09:29:22 +00:00
github-actions[bot]
0426cb78f7
New Crowdin Translations (automated) ( #32589 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-28 13:23:13 +00:00
Claire
8103e69b17
Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict caused by glitch-soc changing the path to images, and upstream
removing styling using such an image.
Removed the styling as upstream did.
- `app/models/account.rb`:
Conflict due to upstream changing lines adjacent to a change made in glitch-soc
to have configurable limits.
Ported upstream's changes.
- `yarn.lock`:
Dependencies adjacent to glitch-soc-only dependencies updated.
Updated them as well.
2024-10-26 13:38:07 +02:00
Matt Jankowski
97b18d10b4
Move hcaptcha service config to config_for yml ( #30662 )
2024-10-23 14:25:43 +00:00
Matt Jankowski
35f008aa2a
Move translation service config to config_for yml ( #30663 )
2024-10-23 13:32:18 +00:00
David Roetzel
05f23df3b7
Add endpoint to remove web push subscription ( #32626 )
2024-10-23 08:02:31 +00:00
Matt Jankowski
40b4f73c18
Pre-import Rails 7.2 generated config minor changes ( #30579 )
2024-10-21 08:07:07 +00:00
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
github-actions[bot]
8eae0d067d
New Crowdin Translations (automated) ( #32573 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-18 07:56:43 +00:00
Claire
8b56509625
Add more explicit explanations about author attribution and fediverse:creator ( #32383 )
2024-10-17 09:03:08 +00:00
github-actions[bot]
009f2ebc32
New Crowdin Translations (automated) ( #32553 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-17 08:21:51 +00:00
Claire
6ff1954bdb
Change Active Record Encryption variable check to check for emptiness ( #32537 )
2024-10-16 08:43:45 +00:00
github-actions[bot]
acc1973f3a
New Crowdin Translations (automated) ( #32533 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-16 08:12:43 +00:00
github-actions[bot]
7d89cea0ea
New Crowdin Translations (automated) ( #32339 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-15 09:26:28 +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
Jeremy Kescher
d364a1b0a7
Merge branch 'upstream-main' into develop
2024-10-11 00:53:18 +02:00
Jeremy Kescher
9090719153
Merge remote-tracking branch 'refs/remotes/upstream/stable-4.3' into develop
2024-10-10 22:57:13 +02:00
Claire
c574f5b53f
Change how migrations duplicated between glitch and upstream are handled ( #2878 )
2024-10-09 18:36:19 +02:00
