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

835 commits

Author SHA1 Message Date
Jeremy Kescher
a38cc7ec83
Merge branch 'upstream-main' into develop
Some checks failed
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 / build (production) (push) Has been cancelled
Details
Ruby Testing / build (test) (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-17 00:02:19 +01:00
Claire
4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
Emelia Smith
ddfb3d123b
Improve display of statuses in admin panel (#30813) 2024-11-15 09:38:01 +00:00
Claire
e8b6607ece
Fix titles being escaped twice (#32889) 2024-11-14 13:28:00 +00:00
Emelia Smith
a34edc211f
Add audit logging to Relays (#32819) 2024-11-12 08:35:08 +00:00
Claire
f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
Matt Jankowski
1e71c4e247
Use enum-generated IpBlock.severity... scopes (#31210) 2024-11-08 14:23:52 +00:00
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
Matt Jankowski
bde0f1239a
Add InetContainer with scopes of containing and contained (#32802) 2024-11-08 10:08:36 +00:00
Claire
b013067027 Fix ruby linting issue 2024-11-03 21:08:10 +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
2d5f770295
feat(preview): Allow bypassing CW/sensitive for link preview
Some checks failed
Check i18n / check-i18n (push) Has been cancelled
Details
CodeQL / Analyze (push) Has been cancelled
Details
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Details
Check formatting / 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 / build (production) (push) Has been cancelled
Details
Ruby Testing / build (test) (push) Has been cancelled
Details
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / test (3.1) (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-03 18:26:16 +01:00
Matt Jankowski
b231c3c1bf
Drop support for ruby 3.1 (#32363) 2024-10-31 15:12:08 +00:00
David Roetzel
9de3fd60a0
Add telemetry for status / bio formatting (#32677) 2024-10-29 10:10:17 +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
745c4f900a
Remove unused ApplicationHelper#visibility_icon helper method (#32644) 2024-10-24 08:02:54 +00:00
Matt Jankowski
97b18d10b4
Move hcaptcha service config to config_for yml (#30662) 2024-10-23 14:25:43 +00:00
Eugene Alvin Villar
16597fa735
Fix tl language native name (#32606) 2024-10-22 08:41:40 +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
Matt Jankowski
bd6c96f737
Fix broken i18n in text welcome mailer tags area (#32571) 2024-10-18 07:19:37 +00:00
Matt Jankowski
b78597979a
Fix missing content warning text in rss formatter (#32406) 2024-10-15 14:12:54 +00:00
Matt Jankowski
0e58dc90d9
Use array compact style for classes in nothing_here helper (#32403) 2024-10-15 13:56:29 +00:00
Claire
4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
Florian Kohler
2404d6d1a1
Added Swiss German to languages dropdown (#29281) 
Co-authored-by: David Roetzel <david@roetzel.de>
 2024-10-14 08:57:34 +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
Matt Jankowski
cec8961372
Move admin action log type list generation to helper (#32178) 2024-10-02 14:47:00 +00:00
Matt Jankowski
7d6b9ccd34
Add copyable_input helper method to wrap shared options (#32119) 2024-10-02 14:45:54 +00:00
Matt Jankowski
36f9c96812
Clean up labels on development application form (#32116) 2024-10-02 14:45:12 +00:00
Jeong Arm
65508bb0c0
Show timestamp when the user deletes their account on admin dashboard (#25640) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-01 13:54:28 +00:00
Matt Jankowski
e975b55c24
Remove WebfingerHelper module & move usage inline (#31203) 2024-10-01 09:54:42 +00:00
Matt Jankowski
f251edfc1d
Add date_range view helper (#32187) 2024-10-01 09:30:21 +00:00
Claire
7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Matt Jankowski
675ec1a0ad
Only show recently used tags hint when they are present (#32120) 2024-09-27 08:18:42 +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
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
90d7a4bac4 Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream 2024-09-12 17:22:06 +02:00
Claire
10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Eugen Rochko
3d46f47817
Change embedded posts to use web UI (#31766) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-12 09:41:19 +00:00
Matt Jankowski
cee71b9892
Remove fa_ prefix from status visibility icon method (#31846) 2024-09-11 07:47:16 +00:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
Claire
441af2632d Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream 2024-09-09 18:22:41 +02:00
Mike Dalessio
10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 (#31812) 2024-09-08 18:41:37 +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
a9d0b48b65
Set "admin" body class from admin nested layout (#31269) 2024-09-06 13:58:46 +00:00
Claire
fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
 2024-09-03 21:51:53 +02:00
Claire
ae363f0555
Fix spacing between icons and labels in settings/admin interface (#31728) 2024-09-03 14:43:34 +00:00
Matt Jankowski
c9641c8070
Remove un-needed edge case sort condition in languages helper (#31724) 2024-09-03 13:19:48 +00:00
Claire
ac4002fe08 Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream 2024-09-03 12:12:23 +02:00
Matt Jankowski
2a244e2fdb
Remove unused merge_context helper (#31703) 2024-09-03 08:59:37 +00:00