tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,590 Commits 5 Branches 0 Tags
a37e01d17ea901b97fbd2b15dd3d7255a12e0e04
Commit Graph
20590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tarrien a37e01d17e Update to 4.1.3 2024-01-29 12:37:47 -05:00
Claire 7497029ed4 Bump version to v4.1.3 2024-01-29 12:37:47 -05:00
Renaud Chaput 18857c6ea4 Allow carets in URL search params (#25216) 2024-01-29 12:37:47 -05:00
Vyr Cossont 57074f05ce Fix Redis client and type errors introduced in #24285 (#24342) 2024-01-29 12:37:47 -05:00
Vyr CossontandClaire 3fec0d5272 IndexingScheduler: fetch and import in batches (#24285) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-29 12:37:47 -05:00
Claire a1dbd86347 Change /api/v1/statuses/:id/history to always return at least one item (#25510) 2024-01-29 12:37:45 -05:00
Daniel M Brasil 812be628c7 Fix incorrect pagination headers in /api/v2/admin/accounts (#25477) 2024-01-29 12:36:56 -05:00
Claire e6963721cc Fix infinite loop in AccountsStatusesCleanupScheduler (#24840) 2024-01-29 12:36:56 -05:00
Claire ae68023dcb Improve automatic post cleanup worker performances (#24785) 2024-01-29 12:36:56 -05:00
Claire e92cd220f7 Fix AccountsStatusesCleanupScheduler not spreading deletes across accounts correctly (#24607) 2024-01-29 12:36:56 -05:00
Claire 1f969fe448 Change automatic post deletion thresholds and load detection (#24614) 2024-01-29 12:36:56 -05:00
Claire 14f8930f4a Fix ArgumentError when loading newer Private Mentions (#25399) 2024-01-29 12:36:56 -05:00
Claire 42457e334c Bump version to v4.1.2 2024-01-29 12:36:56 -05:00
Claire cb71ef84f8 Bump version to v4.1.1 2024-01-29 12:36:56 -05:00
Claire 063474d6e1 Add mail headers to avoid auto-replies (#23597) 2024-01-29 12:36:55 -05:00
ClaireandEugen Rochko 80308d384a [Glitch] Refactor conversations components in web UI (#2589) 
Port 3205a654ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-01-28 14:53:08 +01:00
Claire a4e7cc2d94 Merge pull request #2590 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to bf153b384b
 2024-01-28 14:47:35 +01:00
Claire bf153b384b Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
 2024-01-27 19:06:41 +01:00
Claire 420ca90071 Merge pull request #2585 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3205a654ca
 2024-01-27 18:35:29 +01:00
Claire dd7a66949a Fix CSS loading in redirect controller 2024-01-26 21:04:02 +01:00
Claire 54ece5040d [Glitch] Use active variants for boost icons and increase icon size 
Port 5a838ceaa9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-26 20:53:53 +01:00
Eugen RochkoandClaire e5f50478b5 [Glitch] Add confirmation when redirecting logged-out requests to permalink 
Port SCSS changes from b19ae521b7 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-26 20:51:08 +01:00
Claire 5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
github-actions[bot]GitHub ActionsClaire
 		ae9c675930 New Crowdin Translations (automated) (#2564) 
* New Crowdin translations

* Fix bogus translation files

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-26 19:45:04 +01:00
Claire 108fb33478 Merge pull request #2584 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 7a1f087659
 2024-01-26 18:47:09 +01:00
Claire 70de52c297 Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream 2024-01-25 19:51:19 +01:00
Claire adde803656 Merge pull request #2583 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 01ce9df880
 2024-01-25 19:50:12 +01:00
Matt Jankowski 42ab855b23 Add specs for Instance model scopes and add with_domain_follows scope (#28767) 2024-01-25 15:28:27 +00:00
Matt Jankowski 4cdf62e576 Extract rebuild_index method in maintenance CLI (#28911) 2024-01-25 15:26:51 +00:00
Matt Jankowski 0b38946c87 Update paperclip and climate_control gems (#28379) 2024-01-25 15:18:15 +00:00
Matt Jankowski 17ea22671d Fix Style/GuardClause cop in app/controllers (#28420) 2024-01-25 15:13:41 +00:00
Eugen RochkoandClaire 3205a654ca Refactor conversations components in web UI (#28833) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-25 14:34:26 +00:00
Matt Jankowski 274a48a9f4 Extract helper methods for db connection and table existence check in CLI::Maintenance task (#28281) 2024-01-25 13:49:33 +00:00
Matt Jankowski 2866106ec1 Reduce factory creation in spec/models/account_statuses_cleanup_policy (#28361) 2024-01-25 13:37:25 +00:00
Matt Jankowski c8f59d2ca4 Fix Style/TernaryParentheses cop (#28387) 2024-01-25 13:28:49 +00:00
Matt Jankowski ca7053f19c Consolidate db test prep steps to rake task (#28886) 2024-01-25 13:10:39 +00:00
github-actions[bot]andGitHub Actions 59d2ea0d82 New Crowdin Translations (automated) (#28899) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-25 13:00:44 +00:00
Matt Jankowski 6b6586f5d0 Add CustomFilterKeyword#to_regex method (#28893) 2024-01-25 13:00:34 +00:00
renovate[bot] a69506a434 fix(deps): update dependency dotenv to v16.4.1 (#28889) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-25 12:37:23 +00:00
Matt Jankowski 7c9c6c7f80 Fix remaining Rails/WhereExists cop violations, regenerate todo (#28892) 2024-01-25 12:37:07 +00:00
renovate[bot] 1a565e4bea fix(deps): update dependency axios to v1.6.6 (#28895) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-25 12:36:20 +00:00
renovate[bot] d158f7e622 chore(deps): update dependency rspec-rails to v6.1.1 (#28905) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-25 12:33:56 +00:00
Claire 087415d0fe Add tests for processing statuses using bearcap URIs (#28904) 2024-01-25 11:13:36 +00:00
Claire 0471a78055 Add tests for redirect confirmations (#28903) 2024-01-25 11:13:33 +00:00
Claire c50274a0ac Fix redirect confirmation for accounts (#28902) 2024-01-25 10:44:25 +00:00
KMY（雪あすか） 9a8293f58d Fix process of receiving posts with bearcaps is not working (#26527) 2024-01-25 10:37:09 +00:00
Eugen Rochko 22e419f95e [Glitch] Fix search form re-rendering spuriously in web UI 
Port 01ce9df880 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-24 20:53:15 +01:00
Claire 22cfab0ebf Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
 2024-01-24 20:42:53 +01:00
Matt Jankowski 38f7f8b909 Tidy up association declaration in Instance model (#28880) 2024-01-24 17:30:28 +00:00
renovate[bot] 9c5be13980 chore(deps): update dependency chewy to v7.5.0 (#28730) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-24 16:51:47 +00:00