1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-23 14:46:52 +09:00
Commit Graph

24223 Commits

Author SHA1 Message Date
Matt Jankowski
c099797700
Use mastodon config namespace to load software update default value via config_for (#30534) 2024-11-12 08:28:31 +00:00
Emelia Smith
aeae152006
Prevent Web::Push notification delivery if notification is outside of TTL window (#32842) 2024-11-11 19:56:28 +00:00
Claire
1ae5f84774
Fix clicking on avatar/display opening status instead of profile (#2897)
Fix regression from #2895
2024-11-11 16:11:24 +01:00
Matt Jankowski
c78dc23b49
Move account sensitize-related methods to concern (#28865) 2024-11-11 13:08:23 +00:00
Matt Jankowski
d033920b7e
Move account silence-related methods to concern (#28866) 2024-11-11 08:29:55 +00:00
Noa Himesaka
5c18104101 Merge branch 'pr2462' 2024-11-11 13:46:02 +09:00
Noa Himesaka
8f563dd680 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2024-11-11 13:44:26 +09:00
Claire
b7a66c6eac
Fix status clickable area (#2895) 2024-11-10 22:43:27 +01:00
github-actions[bot]
d29f27fad7
New Crowdin Translations (automated) (#2851)
* New Crowdin translations

* Update simple_form.no.yml

* Update no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 22:07:04 +01:00
Claire
710d0bd666
Merge pull request #2894 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 1e71c4e247
2024-11-10 21:05:19 +01:00
Christian Schmidt
157fba4698
Backspace hotkey should override default behaviour (#32826) 2024-11-10 16:16:07 +00:00
Claire
f3eac6f45a [Glitch] Fix list of follow requests not having a back button
Port 6ae1fcd059 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 13:50:14 +01:00
Claire
80378921e6 [Glitch] Fix out-of-view post contents being inconsistent with in-view post contents
Port d482211aa6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 13:50:14 +01:00
Eugen Rochko
3244926565 [Glitch] Add year in review feature to web UI
Port d6349c0e9a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 13:50:14 +01:00
Claire
d19d7a283e [Glitch] Fix alt-text pop-in not using the translated description
Port 0a1b5df202 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-11-10 13:29:04 +01:00
Emelia Smith
e22ec25077
Fix typo in account unlocked localisation (#32821) 2024-11-10 12:26:51 +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
Matt Jankowski
10c895dc84
Use existing arel scopes instead of string ordering (#32801) 2024-11-08 14:21:44 +00:00
Matt Jankowski
bde0f1239a
Add InetContainer with scopes of containing and contained (#32802) 2024-11-08 10:08:36 +00:00
Matt Jankowski
df54196a14
Use touch_all with batches (#32799) 2024-11-08 10:00:15 +00:00
Matt Jankowski
4ef3a1a38d
Match dependency-generator output for require_relative usage (#32800) 2024-11-08 09:55:15 +00:00
github-actions[bot]
8df867b20a
New Crowdin Translations (automated) (#32803)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-08 09:53:47 +00:00
Essem
4563b3a1c9
Fix invisible reactions on detailed statuses when logged out 2024-11-07 20:22:28 -06:00
Matt Jankowski
f180880f65
Remove postgres version support check for REINDEX in migration (#32744) 2024-11-07 15:40:41 +00:00
Matt Jankowski
870bb06994
Add coverage for misc serializers (#32781) 2024-11-07 15:37:26 +00:00
Matt Jankowski
41227aeb95
Update Rails to version 7.2.2 (#30391) 2024-11-07 14:58:20 +00:00
renovate[bot]
16b074d731
Update dependency net-http to '~> 0.5.0' (#32794)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-07 13:56:14 +00:00
Matt Jankowski
697947116e
Add EmailDomainBlock.parents scope (#31968) 2024-11-07 13:46:20 +00:00
Claire
6ae1fcd059
Fix list of follow requests not having a back button (#32797) 2024-11-07 11:45:46 +00:00
Matt Jankowski
e0a44b8317
Use shell.indent for list output indentation in CLI area (#31969) 2024-11-07 10:34:13 +00:00
Matt Jankowski
68b545ef33
Add Status.not_direct_visibility scope (#32065) 2024-11-07 10:32:33 +00:00
Matt Jankowski
73f66af6eb
Update location of unused MIN_SCHEDULE_OFFSET constant (#31217) 2024-11-07 10:28:59 +00:00
Matt Jankowski
ae667624ac
Use with_options for shared settings options in routes (#30847) 2024-11-07 10:07:04 +00:00
Claire
befb44a08c
Fix “uninitialized constant HttpLog” errors in tootctl (#32796) 2024-11-07 09:57:42 +00:00
renovate[bot]
8f4af29a73
Update dependency aws-sdk-s3 to v1.170.0 (#32791)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-07 09:45:19 +00:00
github-actions[bot]
4ed3ce2377
New Crowdin Translations (automated) (#32793)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-07 09:45:05 +00:00
Claire
bf454e9956
Merge pull request #2892 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to b06fd54c30
2024-11-06 22:15:51 +01:00
Claire
d482211aa6
Fix out-of-view post contents being inconsistent with in-view post contents (#32778) 2024-11-06 13:30:53 +00:00
renovate[bot]
1392daa638
Update dependency discard to v1.4.0 (#32785)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-06 10:58:50 +00:00
Matt Jankowski
4053cd2bff
Update faraday to version 2.12.0 (#32718) 2024-11-06 10:58:28 +00:00
renovate[bot]
e581c1a520
Update docker.io/ruby Docker tag to v3.3.6 (#32784)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-06 10:58:01 +00:00
renovate[bot]
e4b4d6d262
Update dependency ruby to v3.3.6 (#32773)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-06 10:57:42 +00:00
Claire
2bea74e69d
Avoid latest featured tag use on post removal unless necessary (#32787) 2024-11-06 10:51:54 +00:00
github-actions[bot]
871e3b25e8
New Crowdin Translations (automated) (#32782)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-06 08:21:13 +00:00
Eugen Rochko
d6349c0e9a
Add year in review feature to web UI (#32709) 2024-11-05 14:40:07 +00:00
Matt Jankowski
20a147170e
Remove unused usage method from REST::V1::InstanceSerializer (#32768) 2024-11-05 14:20:27 +00:00
David Roetzel
d60ef3f17e
Disable httplog gem in production (#32776) 2024-11-05 08:55:34 +00:00
github-actions[bot]
933fa81baf
New Crowdin Translations (automated) (#32772)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-05 08:41:09 +00:00
renovate[bot]
883b509988
Update dependency postcss-preset-env to v10.0.9 (#32746)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-05 08:36:03 +00:00