~cytrogen/masto-fe

ref: 1feffe43265b1a3d46b70ee72330b6ae04818f8a masto-fe/yarn.lock -rw-r--r-- 597.5 KiB
6ac4848f — Laura Hausmann 2 years ago
Merge remote-tracking branch 'upstream' into glitch
1a4a23b5 — Claire 2 years ago
Merge pull request #2439 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 4c2aca777f6ae6942d0cf11aee56a925694ccdef
3da7afde — Claire 2 years ago
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
9af24835 — Claire 2 years ago
Merge pull request #2434 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 640421f661ee4d7e76a2aab607e7b15687940b6f
5fc5a548 — renovate[bot] 2 years ago
Update DefinitelyTyped types (non-major) (#27327)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
eabe8397 — renovate[bot] 2 years ago
Update eslint (non-major) (#27328)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
53f5b27b — Claire 2 years ago
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
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.
19ebf779 — Claire 2 years ago
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
d2251586 — renovate[bot] 2 years ago
Update dependency @reduxjs/toolkit to v1.9.7 (#27275)

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

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
665093a7 — renovate[bot] 2 years ago
Update dependency postcss to v8.4.31 (#27199)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
66a7bc21 — renovate[bot] 2 years ago
Update dependency glob to v10.3.10 (#27169)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
0f588a4a — renovate[bot] 2 years ago
Update dependency axios to v1.5.1 (#27159)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2979a592 — renovate[bot] 2 years ago
Update dependency @material-design-icons/svg to v0.14.13 (#27181)

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