mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-10-18 18:05:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
23390 commits 5 branches 144 tags 246 MiB
Commit graph

1474 commits

Author SHA1 Message Date
Jeremy Kescher 9c355a240b
Merge remote-tracking branch 'upstream/main' into develop 2024-08-31 12:53:19 +02:00
Jeremy Kescher 232b6409f5
New versioning scheme, bump Catstodon revision to 1.0.0
Some checks failed
Bundler Audit / security (push) Has been cancelled
Details
Check i18n / check-i18n (push) Has been cancelled
Details
CodeQL / Analyze (javascript) (push) Has been cancelled
Details
CodeQL / Analyze (ruby) (push) Has been cancelled
Details
Crowdin / Upload translations / upload-translations (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
Ruby Testing / build (production) (push) Has been cancelled
Details
Ruby Testing / build (test) (push) Has been cancelled
Details
Ruby Testing / test (3.1) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.1) (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 (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Details
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
2024-08-26 19:07:22 +02:00
Claire 11b8017b45 Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream 2024-08-26 18:52:33 +02:00
Jeremy Kescher 7df41062ba
Merge branch 'glitch' into develop 2024-08-26 18:31:12 +02:00
Matt Jankowski bcc4b1078c
Fix Rails/RootPathnameMethods cop (#31582) 2024-08-26 07:35:07 +00:00
Claire d0529b810a Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream 2024-08-24 12:06:31 +02:00
Claire 97f6baf977
Bump version to v4.3.0-beta.1 (#30989) 2024-08-23 16:07:32 +00:00
Claire c493689e84
Change output format of repo:changelog task (#31546) 2024-08-23 12:55:54 +00:00
Jeremy Kescher 1c0c393a19
Bump Catstodon revision to 1.0.10
Some checks failed
Bundler Audit / security (push) Has been cancelled
Details
Check i18n / check-i18n (push) Has been cancelled
Details
CodeQL / Analyze (javascript) (push) Has been cancelled
Details
CodeQL / Analyze (ruby) (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
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 (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Details
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
2024-08-18 18:10:19 +02:00
Jeremy Kescher 909a3b41a1
Bump Catstodon revision to 1.0.9
Some checks failed
Bundler Audit / security (push) Has been cancelled
Details
Check i18n / check-i18n (push) Has been cancelled
Details
CodeQL / Analyze (javascript) (push) Has been cancelled
Details
CodeQL / Analyze (ruby) (push) Has been cancelled
Details
Crowdin / Upload translations / upload-translations (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
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 (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Details
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
2024-08-16 16:08:01 +02:00
Jeremy Kescher 08e538f8a4
Merge branch 'glitch' into develop 2024-08-16 16:05:14 +02: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
Django 709dcd07f2
Add support for incoming <s> tag (#31375) 2024-08-12 11:10:05 +00:00
Jeremy Kescher 7d8714db81
Bump Catstodon revision to 1.0.8 2024-08-11 19:12:59 +02:00
Jeremy Kescher 084cfb7d6c
Merge branch 'refs/heads/glitch' into develop 2024-08-11 19:09:56 +02:00
Claire 31a00c0c1a Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream 2024-08-09 17:15:32 +02:00
Claire cbdd8edf68
Revamp notification policy options (#31343) 2024-08-09 13:30:55 +00:00
Claire 08adca0c63 Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream 2024-08-06 17:27:48 +02:00
Christian Schmidt 9d0cafd06b
Check Content-Length in ResponseWithLimitAdapter (#31285) 2024-08-06 08:23:48 +00:00
Jeremy Kescher 4e0b287075
Bump Catstodon revision to 1.0.7 2024-08-05 21:46:46 +02:00
Jeremy Kescher 81609f09ba
Bump Catstodon revision to 1.0.6 2024-08-04 13:50:03 +02:00
Jeremy Kescher dfb5ac3b98
Bump Catstodon revision to 1.0.5 2024-08-01 00:29:17 +02:00
Jeremy Kescher f3a55891e0
Merge branch 'refs/heads/glitch' into develop 2024-08-01 00:27:00 +02:00
Claire 8dd671a977 Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream 2024-07-31 18:16:01 +02:00
Jeremy Kescher 1145f232e8
Bump Catstodon revision to 1.0.4 2024-07-31 15:03:30 +02:00
Claire 4eab6aef95
Change User-Agent to use Mastodon as the product, and http.rb as platform details (#31192) 2024-07-30 21:40:42 +00:00
Jeremy Kescher 5b2f994ad4
Bump Catstodon revision to 1.0.3 2024-07-30 08:46:24 +02:00
Jeremy Kescher afa0c78715
Merge branch 'refs/heads/glitch' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/actions/interactions.js
 2024-07-30 08:38:14 +02:00
Claire 68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Matt Jankowski 1b839d2cba
Fix mastodon:stats decoration of stats rake task (#31104) 2024-07-23 06:51:57 +00:00
Jeremy Kescher dcb356d256
Bump Catstodon revision to 1.0.2 2024-07-19 18:27:48 +02:00
Jeremy Kescher 5ed78a1e90
Bump Catstodon revision to 1.0.1 2024-07-16 22:38:39 +02:00
Jeremy Kescher 4f80bc8493
Merge branch 'refs/heads/glitch' into develop 2024-07-04 18:17:55 +02:00
Jeremy Kescher 245684be0f
Reset Catstodon revision to 1.0.0 for alpha.5 merge 2024-07-04 18:11:47 +02:00
Claire e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly.
 2024-07-04 17:12:14 +02:00
Claire df9e26158d
Bump version to v4.3.0-alpha.5 (#30920) 2024-07-04 14:59:54 +00:00
Emelia Smith 47f0faebc9
Implement HTML ruby tags for east-asian languages (#30897) 2024-07-03 20:05:59 +00:00
Jeremy Kescher a2b0c0f69a
Bump Catstodon revision to 1.1.3 2024-07-02 19:33:15 +02:00
Jeremy Kescher c1f70540c6
Merge branch 'refs/heads/glitch' into develop 2024-07-02 19:30:16 +02:00
Claire d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
Claire ba6a558a70
Simplify color extraction code using bandunfold (#30869) 2024-06-28 22:41:27 +00:00
Claire 7a84b76bb1
Drop favicon.ico generation (#30375) 2024-06-26 13:44:08 +00:00
Jeremy Kescher fbf9a61c55
Bump Catstodon revision to 1.1.2 2024-06-22 13:34:56 +02:00
Jeremy Kescher b3f731abac
Merge branch 'refs/heads/glitch-soc' into develop 2024-06-22 13:30:26 +02:00
Claire cabd7c21fc Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream 2024-06-19 19:37:37 +02:00
Claire 2cda1dd542
Fix compatibility with Redis < 6.2 again (#30412) 2024-06-19 16:59:37 +00:00
Jeremy Kescher f883c171fb
Bump Catstodon revision to 1.1.1 2024-06-19 17:56:52 +02:00
Jeremy Kescher d220eaab0a
Bump Catstodon revision to 1.1.0 2024-06-18 01:17:19 +02:00
Jeremy Kescher 29ac8c0606
Merge branch 'refs/heads/glitch-soc' into develop 2024-06-18 00:15:52 +02:00
Jeremy Kescher 463585fc3c
Bump Catstodon revision to 1.0.3 2024-06-17 22:55:11 +02:00