mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2025-01-18 19:44:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24943 commits 5 branches 150 tags 287 MiB
Commit graph

773 commits

Author SHA1 Message Date
Jeremy Kescher
4d9949c0ef
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
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / test (3.2) (push) Has been cancelled
Details
Ruby Testing / test (3.3) (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
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 / Elastic Search integration testing (push) Has been cancelled
Details
2025-01-16 18:06:12 +01:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00
S1m
4a2813158d
Add support for standard webpush (#33528) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-14 09:14:00 +00:00
Essem
6bcd0a8c76
Remove emoji reaction settings move migration 
It's now broken and pointless due to the complete removal of legacy user settings. Since this effectively predates the current reaction branch as well, there is little chance that someone running an older iteration will need to use this migration.
 2025-01-04 00:39:17 +01:00
Jeremy Kescher
b9c08026fd
Merge branch 'upstream-main' into develop 2025-01-03 23:46:21 +01:00
Essem
46d3243ad6
Fix old migration 2024-12-30 00:56:02 +01:00
Claire
5e65586161
Merge MoveGlitchUserSettings migration into MoveUserSettings (#2925) 2024-12-29 19:24:52 +01:00
Claire
0d25e4f54d Fix rubocop failure in old glitch-soc migration 2024-12-25 21:21:39 +01:00
Claire
0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 2024-12-25 18:01:37 +01:00
Matt Jankowski
b648c64e2e
Add NOT NULL requirement to columns on polls (#33374) 2024-12-20 14:33:48 +00:00
Claire
85792cc375
Fix incorrect notification settings migration for non-followers (#33348) 2024-12-18 12:25:40 +00:00
Jesse Karmani
db749c7d2b
Fix down clause for notification policy v2 migrations (#33340) 2024-12-18 08:52:47 +00:00
Matt Jankowski
978142ac9e
Add missing NOT NULL on more columns from "large but valid" tables (#33330) 2024-12-17 13:38:18 +00:00
Matt Jankowski
c68eb82ffa
Use explicit config loading from bin/rubocop (#33256) 2024-12-16 13:50:58 +00:00
Matt Jankowski
cf4595967b
Add NOT NULL requirement to columns on account_conversations (#33308) 2024-12-16 08:20:08 +00:00
Matt Jankowski
efc85e39a0
Add missing NOT NULL requirement to small, indexed, valid data tables (#33284) 2024-12-14 00:16:03 +00:00
Matt Jankowski
708919ee93
Update deprecated enum style in older migrations (#32925) 2024-12-12 10:44:58 +00:00
Matt Jankowski
d56aa9031a
Disable Naming/VariableNumber cop in old migrations (#33274) 2024-12-12 08:15:38 +00:00
Matt Jankowski
43702b95a2
Enable Rails/ReversibleMigration cop (#33264) 2024-12-11 15:50:50 +00:00
Matt Jankowski
d6241f6751
Fix Rails/ThreeStateBooleanColumn cop (#33269) 2024-12-11 14:25:48 +00:00
Matt Jankowski
e4e35ab134
Add NOT NULL requirement to account columns on AccountPin (#33244) 2024-12-10 15:50:49 +00:00
Eugen Rochko
30aa0df88c
Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
Claire
fbcd14ff7e
Always remove setting keys in legacy user settings migrations (#33196) 2024-12-06 10:58:18 +00:00
Matt Jankowski
a1143c522b
Add missing on_delete: :cascade foreign keys option (#33175) 2024-12-06 08:29:54 +00:00
Matt Jankowski
17c02c9210
Remove thing_type and thing_id columns from settings table (#31971) 2024-12-05 14:34:14 +00:00
Eugen Rochko
48ea7552dd
Change hashtag trends to be stored in the database instead of redis (#32837) 
Co-authored-by: David Roetzel <david@roetzel.de>
 2024-12-04 11:59:17 +00:00
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
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
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
Eugen Rochko
90f4ffa31d
Fix performance of percentile calculation for annual reports (#32765) 2024-11-04 10:11:06 +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
Jonny Saunders
9074c1fac9
Use likes and shares totalItems on status creations and updates (#32620) 2024-10-28 04:55:18 +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
fae1de699c
Remove duplicate indexes from database (#32454) 2024-10-23 13:26:51 +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
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
Claire
83a98cb81a Add missing on_delete: :cascade on notification_permissions (#32281) 2024-10-07 16:22:11 +02:00
Claire
a59160cf01
Add missing on_delete: :cascade on notification_permissions (#32281) 2024-10-07 07:46:03 +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
Matt Jankowski
c91e06bcad Fix Rails/CreateTableWithTimestamps cop (#30836) 2024-10-04 17:48:03 +02:00
Matt Jankowski
4cae309f6a
Fix Rails/CreateTableWithTimestamps cop (#30836) 2024-10-01 13:56:43 +00:00
Jeremy Kescher
655d28f6a7
Merge remote-tracking branch 'upstream/main' into develop 
Also apply "Make addReaction and removeReaction optional props", therefore:

Co-authored by: Essem <smswessem@gmail.com>
 2024-09-20 11:53:07 +02:00
Claire
62a39d60ce
Fix rolling updates by moving DropEndToEndMessageTables to post-deployment migrations (#31963) 2024-09-19 09:50:06 +00:00
Matt Jankowski
6f836c45aa
Remove crypto values from doorkeeper application/token scopes (#31945) 2024-09-18 09:27:50 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00