[Glitch] Update inconsistent `defaultMessage` Port e58c36d308f7e7e26154837d53da0185a0db7f16 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge branch 'main' into glitch-soc/merge-upstream
[Glitch] Change share action from being in action bar to being in dropdown in web UI Port 1caa5ff39e95f01eb74ee71b76eaa6c0fd7309fd to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix `null` signUp URL handling from #25014 Port 40b948a1fba629c00f37cb5b0065843fd91f4e98 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Rewrite `<LoadGap />` as FC and TS Port 7336f3648b7d590c10f77cb5587ebfd6142087d8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: We removed it from glitch-soc. Keep it deleted.
Fix import order with ESLint Port d27216dc4616d80659c0cc5d2a55394e0e1ae874 to glitch-soc
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream Conflicts: - `.eslintrc.js`: Upstream moved a configuration block in which we had added a glitch-only path. Moved the configuration block as upstream did. - other files: Upstream reordered imports, and those files had different ones. Kept our version and reordered imports using the same rules.
[Glitch] Add support for custom sign-up URLs Port ca66e61b933b97a74f1f79b820a2fa3bd5ffc5f2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe Port 100840c06e5c771524cb2ef55dbb99b077984911 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
[Glitch] Use JSX syntax for Fragments Port 5a16bd7bf4591feb852364da9b84407438c9b7d6 to glitch-soc
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
[Glitch] Use the new JSX transform everywhere Port 8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7 to glitch-soc
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes up to e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3
fixup! [Glitch] Upgrade to React 18
Extract methods for user de-duping in maintenance CLI (#25117)
Fix RSpec/NoExpectationExample cop (#25103)
Fix glitch-soc-only tests being broken because of test refactor