tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,670 Commits 5 Branches 0 Tags
3a973e4dddef4e459d0efb2cd0ebee7b09cacd62
Commit Graph
526 Commits
Author SHA1 Message Date
Claire 3a5da4cb92 Merge commit '5e1ec8b18a48b36b0fc66f04292df9c519b21883' into glitch-soc/stable-4.6 2026-09-01 16:07:09 +02:00
Juan Hernández Babón 63eae9292e Fixes GHSA-62j4-hvj7-px3f 2026-09-01 14:33:35 +02:00
David Roetzel 1fcb02d612 Add another permission check to admin area (#39974) 2026-09-01 14:33:35 +02:00
Claire 2db065960d Merge commit '70ca3d5ee7042810636f7270ce942ad176a98209' into glitch-soc/merge-4.6 2026-08-28 19:05:15 +02:00
ClaireandShlee 3ccfbbe195 Fix various off-by-one errors in statistics time ranges (#40193) 
Co-authored-by: Shlee <github@shl.ee>
 2026-08-21 18:04:11 +02:00
Claire 2be3994558 Merge commit '930aa9fee26bf9eaefe27826fa1061288d83373b' into glitch-soc/stable-4.6 2026-07-27 16:05:45 +02:00
Claire 930aa9fee2 Merge commit from fork 
* Fix GHSA-7jvv-fhmg-wpfw

* Fix GHSA-hx34-2pfw-2qfj

* Fix GHSA-vwhj-3g83-v276

* Bump version to v4.6.4
 2026-07-27 16:02:01 +02:00
Claire 1285172f2a Merge commit 'd7bb36a64a842dfac52fb1cfb0fcd6646981fb38' into glitch-soc/merge-4.6 2026-07-19 11:29:44 +02:00
Shlee ef1a880fe1 Fix: Admin invite autofollow option is ignored (#39819) 2026-07-16 14:47:44 +02:00
Claire e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.
 2026-06-09 21:30:54 +02:00
Eugen Rochko ea5b613796 Add ability to view individual newsletters in admin UI (#39271) 2026-06-08 07:05:27 +00:00
Claire 3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
Matt Jankowski 8d4f9a97fe Move by_domain/local interaction check to filter (#39216) 2026-06-01 14:52:19 +00:00
Claire ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.
 2026-05-30 12:13:35 +02:00
David Roetzel 572612fde9 Remove collections feature flag (#39211) 2026-05-29 09:37:42 +00:00
Claire 42ec9a607b Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream 2026-05-18 19:35:08 +02:00
Pia B. 07a05e1edf Add batch remove for collections in reports (#39020) 2026-05-18 14:53:40 +00:00
Claire 808b7a858d Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream 2026-05-13 18:42:04 +02:00
Pia B. 7c05f56fe8 Add batch actions to collections and possibility to report multiple collections (#38991) 2026-05-12 16:13:01 +00:00
Claire 49310aeecf Merge commit '1a2038775c0a999024a615348fcba6240e27b0fa' into glitch-soc/merge-upstream 2026-05-06 21:00:32 +02:00
Pia B. 1a2038775c Add ability to search email blocks by domain (#38923) 2026-05-06 15:54:12 +00:00
Matt Jankowski d243ba36ce Add admin area spec for email subscriptions management (#38912) 2026-05-06 08:47:12 +00:00
Claire 6935fce458 Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream 2026-05-04 21:08:25 +02:00
Eugen RochkoandClaire ee88da4511 Add admin UI for managing email subscriptions (#38741) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-04 13:56:04 +00:00
Claire b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.
 2026-04-25 09:20:39 +02:00
Shlee 7c1d6ab114 Role "collection limit" setting missing in params (#38794) 2026-04-23 13:32:12 +00:00
Claire 60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
Matt Jankowski 5a7c565396 Extract common lists for status/reblog preload/cacheable (#35285) 2026-03-23 15:53:56 +00:00
Claire 0e1ea3110e Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.
 2026-02-27 21:25:37 +01:00
Matt Jankowski 7e5e96739f Use consistent calling style for TagManager#normalize_domain (#35764) 2026-02-27 16:38:34 +00:00
Claire e3cb4dea42 Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-soc/merge-upstream 2026-02-25 19:11:22 +01:00
David Roetzel e2c9426c77 Split status batch and moderation actions (#37970) 2026-02-25 10:07:46 +00:00
Claire eebed16f59 Merge commit '8e7c3973dc67835e0ce9c7073b9344ec19d3910a' into glitch-soc/merge-upstream 2026-02-19 21:52:23 +01:00
David Roetzel e288bf6516 Show reported collections in moderation interface (#37898) 2026-02-19 12:46:38 +00:00
Claire b041869887 Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream 2026-02-18 18:40:03 +01:00
Nicholas La Roux 438602c488 Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795) 2026-02-17 14:56:46 +00:00
Claire 2373c5a132 Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream 2026-02-11 20:26:56 +01:00
Claire dfe44bcaef Add ability to require 2FA for specific roles (including Everybody) (#37701) 2026-02-11 14:34:09 +00:00
Claire 34aa825e96 Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream 2025-12-04 20:16:21 +01:00
Echo 048746e56b Hide domain for local emojis in admin (#37080) 2025-12-01 14:24:24 +00:00
Claire 7a56972381 Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream 2025-11-19 21:49:09 +01:00
Matt Jankowski 9872197d1f Fix Rails/RedirectBackOrTo cop (#36930) 2025-11-19 09:28:43 +00:00
Claire 490c89a5a9 Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream 2025-10-09 17:59:13 +02:00
Matt Jankowski 0152659245 Use tag filter for pending tag count on admin dashboard (#36404) 2025-10-09 08:08:29 +00:00
Claire 6fc9febb47 Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream 2025-09-05 20:03:42 +02:00
Matt Jankowski 3efba15b3c Use pluck on DomainAllow.allowed_domains for export (#36019) 2025-09-05 12:30:18 +00:00
Claire e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.
 2025-07-30 20:05:45 +02:00
Osman 39250ab961 Sort auditable accounts (#35272) 2025-07-30 15:08:05 +00:00
Matt Jankowski 139025fce0 Fix wrong policy authorization in admin controllers (#35588) 2025-07-30 13:17:53 +00:00
Matt Jankowski ece49baa38 Use generated query method for check in admin/domain_blocks (#35589) 2025-07-30 09:27:29 +00:00