luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-21 14:23:04 +00:00
Code Issues Projects Releases Wiki Activity
18823 commits 1 branch 0 tags 248 MiB
Commit graph

18823 commits

This branch
This branch
All branches
Author SHA1 Message Date
Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
 2023-08-13 18:47:15 +02:00
Claire 678fa1e6af
Merge pull request #2366 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3a4d3e9d4b
 2023-08-12 21:27:29 +02:00
Eugen Rochko 57a4e7927a [Glitch] Add client-side timeout on resend confirmation button 
Port 2f932cb2bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-12 09:38:57 +02:00
Claire ea8802a05a Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream 2023-08-12 09:36:38 +02:00
Claire 150cfcf3ae
Fix border-radius on “sensitive media” overlay for full-width media (#2364) 2023-08-12 09:30:27 +02:00
Claire 0dfc6ea3ef
Merge pull request #2365 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream up to 425d77f812
 2023-08-12 09:30:08 +02:00
Claire 882e770400 [Glitch] Change interaction modal input to disable browser spell-checking, capitalization and autocomplete 
Port 71fd70335a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-11 22:26:27 +02:00
Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
 2023-08-11 22:15:41 +02:00
github-actions[bot] 3378bdb01f
New Crowdin translations (#2354) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-08-11 22:03:11 +02:00
Renaud Chaput 121443c0fc
Upgrade JS dev dependencies (#26442) 2023-08-11 09:59:57 +02:00
Nick Schonning 9dff838edc
Merge duplicate Gemfile groups (#26441) 2023-08-10 21:51:48 +02:00
Claire 4bc0dd751c
Add S3_DISABLE_CHECKSUM_MODE environment variable for compatibility with some S3-compatible providers (#26435) 2023-08-10 14:15:18 +02:00
renovate[bot] 3dd3c50811
Update dependency pg-connection-string to v2.6.2 (#26427) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 11:07:33 +02:00
renovate[bot] 27d8e9be4a
Update dependency eslint-import-resolver-typescript to v3.6.0 (#26429) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 11:07:15 +02:00
renovate[bot] 7572fa21a3
Update babel monorepo to v7.22.10 (#26421) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 11:01:40 +02:00
renovate[bot] 05022c9218
Update dependency pg to v8.11.2 (#26426) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:59:42 +02:00
renovate[bot] 700f948fc9
Update dependency @rails/ujs to v7.0.7 (#26422) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:44:14 +02:00
renovate[bot] 1a308d1a22
Update dependency rails to v7.0.7 (#26428) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:44:00 +02:00
renovate[bot] 54dfacafcb
Update dependency regenerator-runtime to ^0.14.0 (#26432) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:39:47 +02:00
renovate[bot] 43741ba2b9
Update dependency mime-types to '~> 3.5.0' (#26431) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:24:34 +02:00
renovate[bot] ba318a42fe
Update dependency sass to v1.65.1 (#26433) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:23:37 +02:00
renovate[bot] c645308c6e
Update dependency eslint-config-prettier to v9 (#26434) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 10:23:00 +02:00
renovate[bot] 65f56bd849
Update dependency haml_lint to v0.49.3 (#26424) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 09:50:22 +02:00
renovate[bot] 74c422ad0a
Update dependency immutable to v4.3.2 (#26425) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 09:48:41 +02:00
renovate[bot] 426ca4f76c
Update dependency aws-sdk-s3 to v1.132.1 (#26423) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-10 09:47:55 +02:00
github-actions[bot] 8cbf4a5296
New Crowdin Translations (automated) (#26373) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-10 09:47:42 +02:00
renovate[bot] 26fa4a6e82
Update eslint (non-major) (#26323) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-09 22:21:41 +02:00
renovate[bot] 59678c6d5d
Update dependency sass to v1.64.2 (#26315) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-09 22:19:12 +02:00
Claire 4caa9f0e69
Change the hashtag column to not display the hashtag header on pinned columns (#26416) 2023-08-09 16:32:40 +02:00
Matt Jankowski d9a9323968
Avoid connecting to a running ES instance in ES search check spec (#26413) 2023-08-09 13:15:04 +02:00
Foritus 405f141fe0
Change: Block GPTBot (#26396) 2023-08-09 11:58:46 +02:00
Matt Jankowski 2c88364222
Restore console behavior in test env (#26401) 2023-08-09 11:26:56 +02:00
Matt Jankowski 271d384fd0
Use migration classes in migrations where current definition conflicts with older (#26390) 2023-08-09 11:26:42 +02:00
Claire b12d75ef4f
Fix blocking subdomains of an already-blocked domain (#26392) 2023-08-09 09:39:36 +02:00
Claire dab54ccbba
Prepare v4.2.0-beta1 (#26339) 2023-08-08 16:12:12 +02:00
Claire 8b37dd2c86
Fix Content Security Policy sometimes unnecessarily allowing hCaptcha scripts (#26388) 2023-08-08 15:41:38 +02:00
Claire 2c204d904b
Change DB_REPLICA_* environment variables to REPLICA_DB_* (#26386) 2023-08-08 13:59:40 +02:00
Claire 4773d7b9aa
Fix preview_cards_statuses_pkey not being reindexed concurrently (#26384) 2023-08-08 11:41:53 +02:00
Eugen Rochko 0e2a4d3897
Fix adding column with default value taking longer on Postgres >= 11 (#26375) 2023-08-08 09:09:58 +02:00
Eugen Rochko 72423bc8f6
Change account search tokenizer and queries (#26378) 2023-08-08 09:09:14 +02:00
Matt Jankowski 60fbb0fe91
Omniauth 2.0 version bump (#24209) 2023-08-08 08:57:18 +02:00
Claire 30c64bf616
Fix list import concurrently creating lists of the same name (#26372) 2023-08-07 17:59:20 +02:00
Claire cd6f2b3cbc
Fix interaction modal layout (#26368) 2023-08-07 17:58:29 +02:00
Matt Jankowski c363978782
Spec media attachment speedups (#25416) 2023-08-07 17:58:12 +02:00
Eashwar Ranganathan 11f5a8e54b
Make mastodon-streaming systemd unit templated (#24751) 
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
 2023-08-07 15:41:34 +02:00
github-actions[bot] d2dbaba407
New Crowdin Translations (automated) (#26209) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-07 13:37:54 +02:00
Eugen Rochko e325443b02
Change header of hashtag timelines in web UI (#26362) 2023-08-07 09:46:11 +02:00
Claire 79936c584f
Fix report modal secondary buttons style (#26341) 2023-08-04 16:25:44 +02:00
Claire d5bee37c57
Fix missing cached preview cards attributes (#26343) 2023-08-04 16:13:47 +02:00
Emelia Smith 65096c1ccd
Change streaming /metrics to include additional metrics (#26299) 2023-08-04 16:11:30 +02:00