1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 21:59:04 +09:00
Commit Graph

23356 Commits

Author SHA1 Message Date
Matt Jankowski
5a8f2fe31d
Convert settings/exports controller spec to system/request specs (#31965) 2024-09-19 13:43:40 +00:00
Matt Jankowski
2946a9286b
Use headers shorthand in mailers (#31956) 2024-09-19 13:38:32 +00:00
renovate[bot]
6801afa12f
Update dependency devise-two-factor to v6 [SECURITY] (#31957)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Roetzel <david@roetzel.de>
2024-09-19 10:56:09 +00:00
Eugen Rochko
ef4d6ab988
Fix browser glitch caused by two overlapping scroll animations in web UI (#31960) 2024-09-19 10:52:46 +00:00
github-actions[bot]
efdc17513d
New Crowdin Translations (automated) (#31974)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-19 10:34:19 +00:00
Matt Jankowski
5d573c976e
Remove unused E2EE-related methods (#31964) 2024-09-19 10:23:58 +00:00
Matt Jankowski
b071e618e7
Combine API request spec assertions (#31970) 2024-09-19 10:15:21 +00:00
renovate[bot]
1fce55cf5d
Update dependency aws-sdk-s3 to v1.163.0 (#31972)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-19 09:51:14 +00:00
renovate[bot]
90db524a90
Update dependency puma to v6.4.3 (#31975)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-19 09:50:58 +00:00
Claire
62a39d60ce
Fix rolling updates by moving DropEndToEndMessageTables to post-deployment migrations (#31963) 2024-09-19 09:50:06 +00:00
Eugen Rochko
29656cb9e0
Fix sass deprecation warning (#31961) 2024-09-18 17:39:32 +00:00
Renaud Chaput
8b70834035
Fix the appearance of avatars when they do not load (#31966) 2024-09-18 17:39:15 +00:00
Matt Jankowski
e3baa1cdda
Add coverage for AccountDeletionRequest class (#31937) 2024-09-18 13:29:57 +00:00
renovate[bot]
42f9f507b6
Update dependency pg to v8.13.0 (#31949)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 13:29:21 +00:00
Matt Jankowski
bf8eaaa9a5
Convert controller spec for security_key_options endpoint to request spec (#31938) 2024-09-18 09:42:36 +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
renovate[bot]
2d399f5d4a
Update dependency pg-connection-string to v2.7.0 (#31950)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 09:17:57 +00:00
Christian Schmidt
7740f1a6bb
Mute XHR abort errors (#31952) 2024-09-18 08:43:24 +00:00
renovate[bot]
a791274824
Update dependency sass to v1.79.1 (#31958)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 08:28:42 +00:00
Matt Jankowski
eb16763bff
Use have_http_link_header matcher in api/v1/trends/* specs (#31940) 2024-09-18 08:22:07 +00:00
Matt Jankowski
943738671c
Remove unneeded to_s on Link header comparison in statuses controller spec (#31941) 2024-09-18 08:21:31 +00:00
renovate[bot]
6f3d7516dc
Update dependency dotenv to v3.1.4 (#31953)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 08:10:22 +00:00
github-actions[bot]
bd86c692cf
New Crowdin Translations (automated) (#31959)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-18 08:06:44 +00:00
renovate[bot]
b7548dbf29
Update dependency memory_profiler to v1.1.0 (#31947)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 08:05:59 +00:00
Matt Jankowski
a397141d78
Move non-action public method controller callback to private methods (#31933) 2024-09-18 08:05:25 +00:00
renovate[bot]
f3f06dafe3
Update dependency babel-loader to v8.4.1 (#31931)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-18 08:05:06 +00:00
Claire
486e61677c
Merge pull request #2848 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 3e91c101b3
2024-09-17 18:34:28 +02:00
Claire
6bd86fede0 [Glitch] Increase no-gap-breakpoint by 32px to fix overflow
Port d2f9075078 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-17 18:13:36 +02:00
Michael Stanclift
a85b2476c2 [Glitch] Fix background of text detection progress
Port 5a33a5658b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-17 18:13:36 +02:00
Claire
93b2c8164e [Glitch] Fix selectSettingsNotificationsExcludedTypes not being memoized properly
Port ca8e892c1a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-17 18:13:36 +02:00
Claire
11de3dbef6 [Glitch] Enable grouped notifications unconditionally
Port c620452fd7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-17 18:13:36 +02:00
Claire
6de18bb475 Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream 2024-09-17 17:54:00 +02:00
Claire
3e91c101b3
Bump version to 4.3.0-beta.2 (#31948) 2024-09-17 15:42:45 +00:00
David Roetzel
d8f9db547a
Merge commit from fork
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-09-17 16:59:29 +02:00
github-actions[bot]
6a233cbfcf
New Crowdin Translations (automated) (#31946)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-17 13:02:53 +00:00
Claire
d2f9075078
Increase no-gap-breakpoint by 32px to fix overflow (#31889) 2024-09-17 03:19:42 +00:00
Michael Stanclift
5a33a5658b
Fix background of text detection progress (#31943) 2024-09-17 03:19:04 +00:00
Claire
18209d2011
Merge pull request #2847 from ClearlyClaire/glitch-soc/fixes/click-detailed-status
Fix detailed statuses being clickable and linking to broken pages
2024-09-16 23:51:37 +02:00
Claire
c8ef702ba9
Merge pull request #2846 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to e0648a916a
2024-09-16 23:31:03 +02:00
Claire
43f6792e1b Fix detailed statuses being clickable and linking to broken pages 2024-09-16 22:51:19 +02:00
Claire
0740352ce6 [Glitch] Rename /api/v2_alpha/notifications* to /api/v2/notifications*
Port e0648a916a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-16 21:28:05 +02:00
Eugen Rochko
b6398cf2d3 [Glitch] Fix horizontal scrollbar on who to follow carousel in web UI
Port efb0e2c34b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-16 21:28:05 +02:00
Claire
e25634ccef [Glitch] Convert notification requests actions and reducers to Typescript
Port c0eda832f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-16 21:28:05 +02:00
Claire
665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
2024-09-16 21:08:58 +02:00
Claire
ca8e892c1a
Fix selectSettingsNotificationsExcludedTypes not being memoized properly (#31881) 2024-09-16 14:51:56 +00:00
Claire
6c76a7a907
Fix cancel follow request button sometimes saying “Follow back” (#31934) 2024-09-16 13:20:44 +00:00
Claire
c620452fd7
Enable grouped notifications unconditionally (#31929) 2024-09-16 13:12:10 +00:00
Claire
e0648a916a
Rename /api/v2_alpha/notifications* to /api/v2/notifications* (#31840) 2024-09-16 12:10:02 +00:00
Eugen Rochko
efb0e2c34b
Fix horizontal scrollbar on who to follow carousel in web UI (#31912) 2024-09-16 12:08:37 +00:00