~cytrogen/masto-fe

e9a181c5 — Claire 2 years ago
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
702d1629 — Claire 2 years ago
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
d7fcd700 — Claire 2 years ago
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
cfc0da77 — Michael Stanclift 2 years ago
[Glitch] Fix retention dashboard not displaying correct month

Port 7fddeca1907493fb327316c5447740922acb934f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
19ebf779 — Claire 2 years ago
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
e95d25e1 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27260)

Co-authored-by: GitHub Actions <noreply@github.com>
5e56f3db — Claire 2 years ago
Change some worker lock TTLs (#27246)

7e7d6e69 — Claire 2 years ago
Fix incorrectly keeping outdated update notices absent from the API endpoint (#27021)

1e2d4975 — Claire 2 years ago
Fix import progress not updating on certain failures (#27247)

ee866ec0 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27220)

Co-authored-by: GitHub Actions <noreply@github.com>
f68d5402 — Emelia Smith 2 years ago
Fix websocket connections being incorrectly decremented twice on errors (#27238)

5f2d494f — renovate[bot] 2 years ago
Update dependency react-redux to v8.1.3 (#27229)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
c2f13769 — Jake Anto 2 years ago
Add PWA shortcut to `/explore` page (#27235)

bad1629d — renovate[bot] 2 years ago
Update dependency core-js to v3.33.0 (#27237)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
73a92f9e — renovate[bot] 2 years ago
Update DefinitelyTyped types (non-major) (#27239)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
829be02a — renovate[bot] 2 years ago
Update Node.js to v20.8 (#27240)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
d80a819f — Claire 2 years ago
Fix explore prompt appearing because of posts being received out of order (#27211)

5393be7a — renovate[bot] 2 years ago
Update eslint (non-major) to v6.7.3 (#27213)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
48ef7d0f — renovate[bot] 2 years ago
Update libretranslate/libretranslate Docker tag to v1.3.12 (#27214)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
9b785877 — renovate[bot] 2 years ago
Update DefinitelyTyped types (non-major) (#27212)

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