tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,556 Commits 5 Branches 0 Tags
Commit Graph

29556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Jankowski
055b739b88
Use with_domain scope in ReportService (#38758) 2026-04-21 09:59:04 +00:00
Claire
5802fba1c3
Merge pull request #3485 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227
 2026-04-20 20:32:22 +02:00
diondiondion
d82bada742
Add "Must follow" section to account suggestion dropdown menu (#38750) 2026-04-20 17:50:37 +00:00
Claire
e7ee3a997c Merge commit '28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added fallback behavior for when the admin-set theme does not exist.
  Glitch-soc has a different theming system, but already had similar fallback,
  so not changing glitch-soc code.
- `spec/helpers/theme_helper_spec.rb`:
  Upstream adapted existing tests for the new fallback behavior, and added some
  tests accordingly.
  Glitch-soc has a different theming system, adapted the new tests accordingly.
 2026-04-20 18:51:00 +02:00
Matt Jankowski
28e5c3bb51
Add coverage for "no change" scenario in admin change emails (#38754) 2026-04-20 16:05:46 +00:00
Claire
ccf5c09ad3
Fix incorrect value for feature_approval.current_user for local users (#38751) 2026-04-20 16:00:15 +00:00
David Roetzel
c0b1fbe0a9
Fix item limit on collections (#38749) 2026-04-20 10:17:12 +00:00
github-actions[bot]
d9149bfed9
New Crowdin Translations (automated) (#38743) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-20 07:47:02 +00:00
renovate[bot]
0d283cc48e
Update dependency propshaft to v1.3.2 (#38740) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-20 07:12:43 +00:00
renovate[bot]
06417e2b92
Update dependency sidekiq-scheduler to v6.0.2 (#38737) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-20 07:12:21 +00:00
renovate[bot]
45fbb3b053
Update dependency faker to v3.8.0 (#38724) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-20 07:11:24 +00:00
renovate[bot]
225fe58d5c
Update dependency sidekiq to v8.1.3 (#38723) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-20 07:11:15 +00:00
renovate[bot]
048700da2f
Update Yarn to v4.14.1 (#38720) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-20 07:09:37 +00:00
Claire
687a24dee8
Merge pull request #3484 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to b15d234ccb5d004180561c440dd45536d70e67b2
 2026-04-18 19:56:43 +02:00
Shlee
bdad4f78f3
Fallback to default theme when admin-selected theme does not exist (#38703) 2026-04-17 16:57:38 +00:00
diondiondion
582a8a0880 [Glitch] Update design of account search dropdown in collection editor 
Port 05a1c170c285221860e27cb3239092401c3cca8b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:18:20 +02:00
diondiondion
fe712fa5af [Glitch] Allow grouping items in Combobox component 
Port 570f2ef4828044312a88ad410fa8e66939e75c56 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:16:16 +02:00
diondiondion
3916132f2f [Glitch] Remove "View other collections from this user" from collection menu 
Port e571994b5c6700cd896795f792978a709a09c5ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:13:13 +02:00
diondiondion
8257bdcbca [Glitch] Implement new Collection inclusion rules in Collection accounts editor 
Port a40b07164019ee38290eb2167b648a9f46c2634a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:12:39 +02:00
Claire
fe869936ab [Glitch] Fix Bundle being used with incorrect prop types by using type-dependent key 
Port 0e6180a5afdecca880ec94077b7086dcbcaa29ab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:12:03 +02:00
diondiondion
7c9d73d1cb [Glitch] Update design of collection accounts editor 
Port 5a38246ee8dffad6789fb4a3a7723477d2d97b4c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:10:54 +02:00
diondiondion
87c66c8b96 [Glitch] Add more actions to collections notifications & context menus 
Port 543db6d24c8764fe3975a138c777ffb1c28ae29e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 18:07:21 +02:00
Claire
e0a34e6d89 Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream 2026-04-17 18:06:10 +02:00
Matt Jankowski
b15d234ccb
Add domain_variants helper to DomainNormalizable concern (#38539) 2026-04-17 15:36:09 +00:00
diondiondion
05a1c170c2
Update design of account search dropdown in collection editor (#38739) 2026-04-17 15:13:18 +00:00
Matt Jankowski
ea33d7fba6
Add AccountMigration#remaining_cooldown_days method (#38561) 2026-04-17 14:01:07 +00:00
Matt Jankowski
1d3ca80bf7
Use model constants more consistently for view expiration collections (#38589) 2026-04-17 13:57:18 +00:00
Shlee
9afaa23e78
Fix incorrect only option in before_validation filters (#38704) 2026-04-17 13:36:38 +00:00
Matt Jankowski
475e6833ff
Update to copy and order for media display options (#38731) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-04-17 13:31:14 +00:00
David Roetzel
b846f88e16
Improve collection item behavior in REST API (#38732) 2026-04-17 13:28:39 +00:00
Matt Jankowski
5722b1bbc5
Remove invalid options from recovery codes controller (#38733) 2026-04-17 13:25:39 +00:00
diondiondion
570f2ef482
Allow grouping items in Combobox component (#38730) 2026-04-17 13:18:04 +00:00
diondiondion
e571994b5c
Remove "View other collections from this user" from collection menu (#38728) 2026-04-17 08:50:35 +00:00
Matt Jankowski
3411d06f9e
Pull user settings defaults from configuration (#38592) 2026-04-17 08:31:37 +00:00
Matt Jankowski
d5f0e37260
Include hosts resolver in request socket DNS lookup (#38699) 2026-04-17 08:09:37 +00:00
github-actions[bot]
3c88310f37
New Crowdin Translations (automated) (#38726) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-17 08:08:49 +00:00
renovate[bot]
58f0a80ae9
Update Node.js to 24.15 (#38707) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-17 07:48:15 +00:00
diondiondion
a40b071640
Implement new Collection inclusion rules in Collection accounts editor (#38719) 2026-04-16 18:05:36 +00:00
Claire
0e6180a5af
Fix Bundle being used with incorrect prop types by using type-dependent key (#38721) 2026-04-16 18:05:04 +00:00
Claire
fc1ba93cdc
Refactor featured collections URL code (#38709) 2026-04-16 16:00:13 +00:00
Shlee
0e4ee62dfc
Fix typo in block_spec.rb (#38714) 2026-04-16 15:59:48 +00:00
David Roetzel
e711f9d492
Federate featured item creation date (#38713) 2026-04-16 15:44:50 +00:00
diondiondion
5a38246ee8
Update design of collection accounts editor (#38712) 2026-04-16 13:59:38 +00:00
Matt Jankowski
0ef00be494
Use bundler version 4.0.10 (#38671) 2026-04-16 11:46:13 +00:00
David Roetzel
961acaf202
Include collection url in API responses (#38708) 2026-04-16 10:09:39 +00:00
renovate[bot]
e05ac2ec04
Update dependency dotenv to v17.4.2 (#38655) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-16 09:46:12 +00:00
renovate[bot]
b17c544f1d
Update dependency postcss-preset-env to v11.2.1 (#38656) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-16 09:46:04 +00:00
renovate[bot]
89611bf32c
Update dependency @rolldown/plugin-babel to v0.2.3 (#38661) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-16 09:45:58 +00:00
github-actions[bot]
18c79e4e45
New Crowdin Translations (automated) (#38705) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-04-16 09:32:46 +00:00
renovate[bot]
21a6ecbfb4
Update dependency faker to v3.7.1 (#38681) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-04-16 09:17:37 +00:00