monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,366 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

20366 Commits

Author SHA1 Message Date
Renaud Chaput 537442853f
Use a context to propagate column-related Props, and remove `forceUpdate` usage (#27548) 2023-10-26 11:00:10 +00:00
Matt Jankowski 3ca974e101
Use `next` keyword in field loop in admin/accounts/index view (#27559) 2023-10-26 10:52:14 +00:00
renovate[bot] 400f5c9174
Update dependency @material-symbols/svg-600 to v0.13.2 (#27565) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-26 10:49:39 +00:00
renovate[bot] 6e018f7228
Update dependency sass to v1.69.5 (#27566) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-26 10:48:55 +00:00
Claire 49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368) 2023-10-25 21:33:44 +00:00
Claire 36c8570e50 Fix HAML linting issue 2023-10-25 20:01:51 +02:00
Claire 62620956d5 Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream 2023-10-25 19:59:17 +02:00
Matt Jankowski 9a3d047f3e
Run `bin/rails app:update` with Rails 7.1 (#27522) 2023-10-25 13:56:09 +00:00
Claire 235a4cfdc8
Fix batch attachment deletion when using OpenStack Swift (#27554) 2023-10-25 13:55:57 +00:00
Renaud Chaput a4e6fe36cb
Add missing ban icons (#27555) 2023-10-25 12:47:37 +00:00
Matt Jankowski 70dbf84b9b
Solve simplest haml-lint `Rubocop` lints (#27529) 2023-10-25 12:38:01 +00:00
Claire fa65c8244f
Fix cache store pool config deprecation warnings (#27551) 2023-10-25 12:01:21 +00:00
Matt Jankowski c926f5fd67
Fix haml-lint `UnnecessaryStringOutput` for views (#27531) 2023-10-25 12:01:00 +00:00
Renaud Chaput 85d4846d8a [Glitch] Fix `<ColumnBackButtonSlim>` 
Port cb92cdf9af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-25 12:22:59 +02:00
Claire 6e9f89e5b6 Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc
- `app/javascript/packs/public.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc
 2023-10-25 12:18:45 +02:00
Claire ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.
 2023-10-25 12:14:24 +02:00
github-actions[bot] c85e0a6b04
New Crowdin Translations (automated) (#27544) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-25 07:36:07 +00:00
renovate[bot] f261b6499f
Update dependency node to 20.9 (#27534) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-25 07:16:19 +00:00
Matt Jankowski cec7f0ed72
Remove unused `#error_explanation` id from error partials (#27536) 2023-10-25 07:12:32 +00:00
Renaud Chaput cb92cdf9af
Fix `<ColumnBackButtonSlim>` (#27540) 2023-10-24 20:43:55 +00:00
Renaud Chaput f08ca3f042
Fix missing icon props (#27539) 2023-10-24 20:43:06 +00:00
Matt Jankowski bc3afb6311
Update `rails/ujs` delegate method usage (#27538) 2023-10-24 20:38:19 +00:00
Claire b19d4eb43d Fix HAML linting issues 2023-10-24 20:53:58 +02:00
Claire 8123e86623 [Glitch] Fix double scroll bars in some columns in advanced interface 
Port 37bbd3c106 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 20:46:11 +02:00
Claire b73e4b59fc [Glitch] Fix history handling not properly handling states after update to react-router v5 
Port 15182d1e5e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 20:34:30 +02:00
たいち ひ c6f990997d [Glitch] Rewrite `emoji_unicode_mapping_light` to TS 
Port 9482810703 to glitch-soc

Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 20:33:55 +02:00
Claire 4ef66d6538 Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  glitch-soc had extra ignores.
  Removed them.
 2023-10-24 20:31:20 +02:00
Claire 3c9c0299c0 Fix ActiveRecord::Migrator monkey-patch 2023-10-24 20:23:46 +02:00
Claire 8a131fb7bc Fix `@rails/ujs` imports 2023-10-24 20:23:31 +02:00
Claire 4b0fb764c3 Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream 
Conflicts and ported changes:
- updated `@rails/ujs` imports
 2023-10-24 19:59:19 +02:00
Eugen Rochko 134de736dc
Change icons in web UI (#27385) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-10-24 17:45:08 +00:00
Michael Stanclift b1885387b6
Fix missing libyaml-dev dependency in Dockerfile (#27533) 2023-10-24 17:32:10 +00:00
Claire e25cc4deb7 Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
 2023-10-24 19:31:14 +02:00
Eugen Rochko 69ea596e55 [Glitch] Fix explore page reloading when you navigate back to it in web UI 
Port d9503a1965 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 19:22:39 +02:00
Claire e6c3d3c744 Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream 2023-10-24 19:21:01 +02:00
Claire 79c154f602 Merge commit 'fc7734df8d8d53639bf244a2f2f3c39bc2fd12a7' into glitch-soc/merge-upstream 2023-10-24 19:20:14 +02:00
Claire 57c0de949b Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream changed how asset host CSP directives are used, and glitch-soc has
  a pretty different CSP file.
  It may be worth reconsidering the differences between upstream and glitch-soc
  but for now, just port the change.
 2023-10-24 19:17:20 +02:00
Claire 787d5ad386 Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Caused by a glitch-soc-only dependency (`exif-js`).
  Kept it.
 2023-10-24 19:05:18 +02:00
Claire 5323f0eeca [Glitch] Fix incorrect proptypes from react-router-v5 update 
Port 0ad66175bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 19:03:16 +02:00
Renaud Chaput 9325cb5759 [Glitch] Convert `<Button>` to Typescript 
Port 9d45a444f9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 19:03:16 +02:00
Eugen Rochko 1138d44c7d [Glitch] Fix missing background behind dismissable banner in web UI 
Port 33bd8eccd5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-24 18:46:08 +02:00
Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.
 2023-10-24 18:41:20 +02:00
Claire 15182d1e5e
Fix history handling not properly handling states after update to react-router v5 (#27526) 2023-10-24 13:24:57 +00:00
Renaud Chaput 6cf9f1211b
Create custom Github Actions for common steps (#27518) 2023-10-24 11:43:24 +00:00
Matt Jankowski 714e3ae5b5
Use Rails 7.1 `normalizes` feature (#27521) 2023-10-24 10:06:10 +00:00
github-actions[bot] 50b7ea810e
New Crowdin Translations (automated) (#27523) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-24 09:51:34 +00:00
Matt Jankowski e923bb9ec9
Use `ENV.fetch` in views, fixes rubocop haml-lint issue (#27527) 2023-10-24 09:30:14 +00:00
Matt Jankowski 4fdc548fa5
Regenerate lint todos (#27513) 2023-10-24 08:08:31 +00:00
たいち ひ 9482810703
Rewrite `emoji_unicode_mapping_light` to TS (#25444) 
Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
 2023-10-24 08:06:14 +00:00
Matt Jankowski e93a75f1a1
Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00