mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-22 07:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24264 commits 5 branches 147 tags 265 MiB
Commit graph

4124 commits

Author SHA1 Message Date
Jeremy Kescher
c9f7e9454c
Merge branch 'upstream-main' into develop
Some checks failed
Ruby Testing / build (production) (push) Has been cancelled
Details
Ruby Testing / build (test) (push) Has been cancelled
Details
Bundler Audit / security (push) Has been cancelled
Details
Check i18n / check-i18n (push) Has been cancelled
Details
CodeQL / Analyze (push) Has been cancelled
Details
Check formatting / lint (push) Has been cancelled
Details
CSS Linting / lint (push) Has been cancelled
Details
Haml Linting / lint (push) Has been cancelled
Details
JavaScript Linting / lint (push) Has been cancelled
Details
Ruby Linting / lint (push) Has been cancelled
Details
JavaScript Testing / test (push) Has been cancelled
Details
Historical data migration test / test (14-alpine) (push) Has been cancelled
Details
Historical data migration test / test (15-alpine) (push) Has been cancelled
Details
Historical data migration test / test (16-alpine) (push) Has been cancelled
Details
Historical data migration test / test (17-alpine) (push) Has been cancelled
Details
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / test (3.2) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (push) Has been cancelled
Details
Ruby Testing / End to End testing (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (push) Has been cancelled
Details
2024-11-08 14:46:42 +01: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
Matt Jankowski
022c1ae6f2
Remove unused deprecator configuration (#32288) 2024-10-08 12:52:52 +00:00
github-actions[bot]
ff3e2c9cfa
New Crowdin Translations (automated) (#32295) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-08 08:10:39 +00:00
Claire
7e06d724c9 Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream 2024-10-07 20:45:07 +02:00
Claire
4a859140ec Merge commit 'edcf3d9234b03d6b1c4b29d1d15339f7f64040fb' into glitch-soc/backports-4.3 2024-10-07 20:03:53 +02:00
Leni Kadali
4238da6ee3
Add error message when user tries to follow their own account (#31910) 2024-10-07 12:05:46 +00:00
github-actions[bot]
2e0d918d7d
New Crowdin Translations for stable-4.3 (automated) (#32253) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-07 11:21:49 +02:00
github-actions[bot]
498024558a
New Crowdin Translations (automated) (#32262) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-07 07:06:43 +00: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
Claire
dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
 2024-10-05 20:45:05 +02:00
Christian Schmidt
cbf1349370 Support /.well-known/host-meta.json (#32206) 2024-10-04 17:48:03 +02:00
Matt Jankowski
19d1392b33 Avoid repeated icon stack in settings sidebar (#32201) 2024-10-04 17:48:03 +02:00
Matt Jankowski
f517f0dbef Fix nav item active highlight for some paths (#32159) 2024-10-04 17:48:03 +02:00
Matt Jankowski
4ad1e955eb Use module: :users in routes/admin section (#30767) 2024-10-04 17:48:03 +02:00
Matt Jankowski
1283c3544c Avoid id duplication conflict with main navigation from settings profile link (#32181) 2024-10-04 17:48:03 +02:00
gunchleoc
160917e718
Pluralize csv imports (#27094) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-04 08:19:01 +00:00
github-actions[bot]
1b247a1dc2
New Crowdin Translations (automated) (#32249) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-04 07:29:53 +00:00
Jeremy Kescher
1290a5609d
Merge branch 'glitch-v4.3.0-rc.1' into develop 2024-10-03 22:25:40 +02:00
github-actions[bot]
fe3f5375e3
New Crowdin Translations (automated) (#32233) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-03 09:15:31 +00:00
Christian Schmidt
33d3ca7cf1
Support /.well-known/host-meta.json (#32206) 2024-10-02 09:23:44 +00:00
github-actions[bot]
ea72d5ec3a
New Crowdin Translations (automated) (#32214) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-02 09:05:57 +00:00
Matt Jankowski
df98cf71e3
Avoid repeated icon stack in settings sidebar (#32201) 2024-10-01 13:50:20 +00:00
Matt Jankowski
4b4bf82ea9
Fix nav item active highlight for some paths (#32159) 2024-10-01 10:48:27 +00:00
Matt Jankowski
efd3f59627
Use module: :users in routes/admin section (#30767) 2024-10-01 10:02:58 +00:00
Emelia Smith
454d21ab5a
Remove OAuth Password Grant Type support (#30960) 2024-10-01 09:56:58 +00:00
Matt Jankowski
685067efd1
Avoid id duplication conflict with main navigation from settings profile link (#32181) 2024-10-01 08:23:05 +00:00