tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,816 Commits 5 Branches 0 Tags
83ea9b94de798a93ca06ea0629e4920e3421c4e5
Commit Graph
28816 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]andGitHub Actions 0a6412faf9 New Crowdin Translations (automated) (#37884) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-17 09:21:35 +00:00
Matt Jankowski 7f28dd1179 Use validation matchers for FollowLimitValidator spec (#37792) 2026-02-17 09:03:46 +00:00
Matt Jankowski 2cb8471d81 Update doorkeeper i18n for invalid code challenge method (#37827) 2026-02-17 09:01:59 +00:00
renovate[bot] 1618c28a48 Update dependency dotenv to v17.3.1 (#37855) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-17 09:01:19 +00:00
Estel 335eeb6239 Add try_files directive comments to nginx.conf (#37866) 2026-02-17 08:55:11 +00:00
diondiondion a644a4a762 Allow managing collection accounts (#37812) 2026-02-16 18:17:20 +00:00
Echo df9d9423b9 [Glitch] Profile redesign: Switch to server flag 
Port f7bf804a3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-16 18:27:42 +01:00
Claire 02ad266b81 Merge commit 'cff25c186bb8bb7cdd29de8938949c775dc0ec7f' into glitch-soc/merge-upstream 2026-02-16 18:27:08 +01:00
Clairerenovate[bot]GitHub ActionsMatt Jankowskigithub-actions[bot]
 		2dc567feec Merge upstream changes up to 284c53f439 (#3405) 
* Capture output in `cli/emoji` spec (#37861)

* Update dependency devise to v5.0.1 (#37860)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency capybara-playwright-driver to v0.5.8 (#37840)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency jsdom to v28.1.0 (#37874)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency stackprof to v0.2.28 (#37873)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* New Crowdin Translations (automated) (#37863)

Co-authored-by: GitHub Actions <noreply@github.com>

* Update dependency ioredis to v5.9.3 (#37849)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove disabled bundlesize-compare workflow (#37875)

---------

Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-16 18:25:33 +01:00
Claire cff25c186b Fix race condition when processing statuses twice with the same idempotency key (#37879) 2026-02-16 14:58:22 +00:00
Echo f7bf804a3f Profile redesign: Switch to server flag (#37876) 2026-02-16 13:06:49 +00:00
Claire 5769ceb6e3 Merge commit '284c53f4391c0e2cdea788bc0aff73190913a488' into glitch-soc/merge-upstream 2026-02-16 13:35:39 +01:00
Claire f199d7995c Add missing “Filter action” source string (#37838) 2026-02-16 12:34:38 +00:00
Claire 284c53f439 Remove disabled bundlesize-compare workflow (#37875) 2026-02-16 09:51:24 +00:00
renovate[bot] ed6d8fad9e Update dependency ioredis to v5.9.3 (#37849) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-16 09:30:56 +00:00
github-actions[bot]andGitHub Actions 6d3eb43500 New Crowdin Translations (automated) (#37863) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-16 09:14:21 +00:00
renovate[bot] 4425b8a0b2 Update dependency stackprof to v0.2.28 (#37873) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-16 08:32:29 +00:00
renovate[bot] 4396217434 Update dependency jsdom to v28.1.0 (#37874) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-16 08:32:12 +00:00
renovate[bot] 9baa51c67e Update dependency capybara-playwright-driver to v0.5.8 (#37840) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-16 08:29:38 +00:00
renovate[bot] e8ca5f633e Update dependency devise to v5.0.1 (#37860) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-16 08:25:24 +00:00
Matt Jankowski 1b724e9e12 Capture output in cli/emoji spec (#37861) 2026-02-16 08:24:39 +00:00
Jeong ArmandCursor 5b106a3453 [Fix undefined current_flavour in controllers (/settings/flavours page) (#3400) 
* [Glitch] Fix undefined `current_flavour` in controllers

After the theming infrastructure migration (#37612, #37807),
`ThemingConcern` was removed and theme-related methods were moved
to `ThemeHelper`. However, controllers like `Settings::FlavoursController`
call `current_flavour` directly in their actions, which is not accessible
from a view helper module.

Include `ThemeHelper` in `ApplicationController` to restore access to
`current_flavour`, `current_skin`, `current_theme`, and other theme
methods in all controllers.

Co-authored-by: Cursor <cursoragent@cursor.com>

* Include ThemeHelper in Settings::FlavoursController instead of ApplicationController

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-16 09:20:51 +01:00
Claire 114105a788 [Glitch] Fix quote-inline fallback being removed even for legacy quotes (#3402) 
Port 2a9c7d2b9e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-15 14:59:38 +01:00
github-actions[bot]andGitHub Actions 4149067b18 New Crowdin translations (#3382) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-14 22:03:41 +01:00
Claire aa235be5ae Merge pull request #3399 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 56ecdde152
 2026-02-14 21:16:37 +01:00
Echo ce4b913792 [Glitch] Emoji: Cache data by path instead of just Etag 
Port 3d0a6ba831 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 18:41:42 +01:00
Echo 66027e4057 [Glitch] Profile redesign: About tab 
Port f5aa5adcf7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 18:41:14 +01:00
Claire 5f72148834 Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream 2026-02-13 18:26:08 +01:00
Claire 3efad88c8c Merge pull request #3398 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 6c3bd944f8
 2026-02-13 18:17:45 +01:00
Matt Jankowski 56ecdde152 Add ContentPoliciesHelper#policy_list to wrap string building in views (#37856) 2026-02-13 15:54:41 +00:00
Echo 3d0a6ba831 Emoji: Cache data by path instead of just Etag (#37858) 2026-02-13 15:23:22 +00:00
Claire c1a5bd52f2 Update devcontainer image version (#37857) 2026-02-13 15:17:12 +00:00
Echo f5aa5adcf7 Profile redesign: About tab (#37851) 2026-02-13 13:37:39 +00:00
Claire 00f16a1863 [Glitch] Fix delete & redraft of pending posts 
Port ab9aa25cd3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 13:05:52 +01:00
Echo c0fe6f8600 [Glitch] Fixes appearing in Following list 
Port 45057d1df2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-13 13:04:15 +01:00
Claire ddc7df2064 Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream 2026-02-13 13:03:51 +01:00
David Roetzel 6c3bd944f8 Allow reporting (local) Collections (#37848) 2026-02-13 11:11:44 +00:00
github-actions[bot]andGitHub Actions a3f34137fd New Crowdin Translations (automated) (#37853) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-02-13 10:45:32 +00:00
renovate[bot] 747ec35885 Update dependency annotaterb to v4.22.0 (#37835) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-13 10:32:29 +00:00
Claire ab9aa25cd3 Fix delete & redraft of pending posts (#37839) 2026-02-13 10:32:16 +00:00
renovate[bot] 83182f9e13 Update dependency vite-tsconfig-paths to v6.1.1 (#37834) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-02-13 10:16:00 +00:00
Echo 45057d1df2 Fixes appearing in Following list (#37854) 2026-02-13 10:03:57 +00:00
Claire ba098fdeb5 Merge pull request #3397 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to c44cc1f5c3
 2026-02-12 22:19:29 +01:00
diondiondion f40f529905 [Glitch] Implement Collection list item design 
Port c44cc1f5c3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-12 18:04:00 +01:00
diondiondion 629bb4989d [Glitch] Fix bad visibility of scroll buttons on follow-suggestions carousel 
Port 46fd341685 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-12 18:03:28 +01:00
diondiondion f16bef3f7d [Glitch] Theme tokens sync 
Port e4bb347f72 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-02-12 18:02:22 +01:00
Claire e451416d90 Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream 2026-02-12 18:00:45 +01:00
diondiondion c44cc1f5c3 Implement Collection list item design (#37850) 2026-02-12 16:30:10 +00:00
David Roetzel f57167c61a Add ID/URI to collection items (#37842) 2026-02-12 15:31:45 +00:00
Matt Jankowski db64ae368f Use implicit class_names in 2FA partials (#37846) 2026-02-12 15:19:43 +00:00