Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,371 Commits 74 Branches 58 Tags
29e0edbfff6229332aaabd3272507e490755cce6
Commit Graph

24371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
29e0edbfff Merge pull request #2962 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to f79b96a5ef
 2025-02-02 18:12:29 +01:00
Eugen Rochko
a3399ed560 [Glitch] Add reminder when about to post without alt text in web UI 
Port 1e70da5e3c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-01 19:58:11 +01:00
Eugen Rochko
800bea7209 [Glitch] Add ability to dismiss alt text badge by tapping it in web UI 
Port 796187c1e8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-01 19:10:32 +01:00
Claire
c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
 2025-02-01 19:07:13 +01:00
renovate[bot]
f79b96a5ef chore(deps): update dependency rubocop to v1.71.1 (#33796) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-31 14:52:27 +00:00
renovate[bot]
a29fc4b44a chore(deps): update dependency puma to v6.6.0 (#33768) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-31 14:14:07 +00:00
Matt Jankowski
77587913ce Convert admin/reports spec controller->system (#33789) 2025-01-31 08:15:51 +00:00
github-actions[bot]
91e4a09f24 New Crowdin Translations (automated) (#33795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-31 08:09:02 +00:00
Matt Jankowski
c5cd9bda48 Convert auth/passwords spec controller->system/request (#33790) 2025-01-31 08:08:56 +00:00
renovate[bot]
7c03327a17 chore(deps): update dependency haml_lint to v0.60.0 (#33791) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-31 07:59:58 +00:00
Claire
a3d2849d15 Fix tootctl feeds build not building list timelines (#33783) 2025-01-30 09:18:46 +00:00
github-actions[bot]
3f4f6317d4 New Crowdin Translations (automated) (#33787) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-30 08:52:04 +00:00
renovate[bot]
005b2ba32f chore(deps): update dependency pino-pretty to v13 (#33778) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-29 15:18:48 +00:00
Claire
e53c8fbaf8 Fix PollExpirationValidator redundant check for expires_at presence (#33777) 2025-01-29 14:37:59 +00:00
Wolf Noble
7ffda06b6a build(Dockerfiles): Set the base registry via an ARG (#33712) 2025-01-29 13:09:17 +00:00
Eugen Rochko
796187c1e8 Add ability to dismiss alt text badge by tapping it in web UI (#33737) 2025-01-29 12:51:47 +00:00
Claire
2d545c5fe5 Fix flaky test in /api/v2/notifications tests (#33773) 2025-01-29 12:49:03 +00:00
Claire
65caf6c085 Merge pull request #2958 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 2beab34ca4
 2025-01-29 13:30:30 +01:00
Eugen Rochko
1e70da5e3c Add reminder when about to post without alt text in web UI (#33760) 2025-01-29 11:37:56 +00:00
Claire
73f599a99e [Glitch] Change language detection debouncing behavior to refresh at least once every 1.5 seconds 
Port 85668becde to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-29 12:07:04 +01:00
Eugen Rochko
2c97a59148 [Glitch] Add loading indicator to timeline gap indicators in web UI 
Port 82183d8a79 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-29 12:06:42 +01:00
Claire
844ae90dad Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream 2025-01-29 12:05:09 +01:00
Matt Jankowski
2beab34ca4 Convert admin/email_domain_blocks controller -> system spec (#33759) 2025-01-29 10:54:20 +00:00
Eugen Rochko
6aa565b319 Fix missing button styles on some forms (#33771) 2025-01-29 10:36:24 +00:00
Claire
51bbca7723 Fix “x” hotkey not working on boosted filtered posts (#33758) 2025-01-29 10:15:32 +00:00
Claire
85668becde Change language detection debouncing behavior to refresh at least once every 1.5 seconds (#33770) 2025-01-29 09:26:06 +00:00
Eugen Rochko
82183d8a79 Add loading indicator to timeline gap indicators in web UI (#33762) 2025-01-29 08:46:04 +00:00
Claire
bd481204b5 Fix missing timeout options in Request class (#33769) 2025-01-29 08:42:20 +00:00
github-actions[bot]
9c85825ac6 New Crowdin Translations (automated) (#33766) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-29 08:38:53 +00:00
renovate[bot]
8e24c4801d Update dependency opentelemetry-instrumentation-rails to v0.35.1 (#33767) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-29 08:27:27 +00:00
wackbyte
b740b17de5 Sync Glitch follow button with Mastodon (#2957) 
Fixes the follow button saying "Follow back" when it actually will
cancel the follow request (mastodon/mastodon#31934). Intentionally omits
the "Mutual" state.
 2025-01-28 21:22:19 +01:00
Claire
6be5a8da68 Merge pull request #2955 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 5b291fcbe4
 2025-01-28 21:22:02 +01:00
Claire
353e5f797c Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
 2025-01-28 18:29:46 +01:00
Claire
5b291fcbe4 Fix incorrect signature after HTTP redirect (#33757) 2025-01-28 14:44:27 +00:00
Claire
32aa83e9d7 Fix polls not being validated on edition (#33755) 2025-01-28 14:38:18 +00:00
github-actions[bot]
80f72ee501 New Crowdin Translations (automated) (#33753) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-28 09:40:50 +00:00
renovate[bot]
0091459369 Update RuboCop (non-major) to v1.71.0 (#33644) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-28 08:39:50 +00:00
Claire
6646a0a9fa Fix parameter validation in our custom devise strategies (#33754) 2025-01-28 08:21:59 +00:00
Matt Jankowski
8a2d764d34 Reduce factory creation across controllers/admin specs (#33752) 2025-01-28 08:08:16 +00:00
Claire
e736363e77 [Glitch] Add hover cards to follow suggestions 
Port e97335191d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-27 18:21:56 +01:00
Eugen Rochko
560eaff2c4 [Glitch] Remove system tooltip for alt text in web UI 
Port 956873362e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-27 18:21:36 +01:00
Eugen Rochko
a21f35786d [Glitch] Fix color of language indicator in light theme in web UI 
Port 81271a18c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-27 18:20:58 +01:00
Eugen Rochko
12bdf58db4 [Glitch] Refactor <LanguageDropdown> into TypeScript 
Port 52a5c8ae05 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-27 18:20:37 +01:00
Claire
75e304d0c9 [Glitch] Convert LanguageDropdownMenu to functional component 
Port 9a0166c3f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-27 18:20:00 +01:00
Eugen Rochko
17af994a05 [Glitch] Add information about alt text to alt text modal in web UI 
Port 0885c31633 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-27 18:20:00 +01:00
Claire
c14c553c7e [Glitch] Convert LanguageDropdown to a functional component 
Port db146046c4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-27 18:20:00 +01:00
Claire
fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream 
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
 2025-01-27 18:19:09 +01:00
Matt Jankowski
93f3c724ae Use expect in remaining controller locations (#33748) 2025-01-27 16:32:06 +00:00
Claire
ea743d68f3 Fix error in TwoFactorPamAuthenticatable when handling invalid params (#33746) 2025-01-27 16:30:18 +00:00
Claire
e97335191d Add hover cards to follow suggestions (#33749) 2025-01-27 16:24:41 +00:00