~cytrogen/masto-fe

ref: 702d162998f8265cbbe731b943a4bd22e6a1c7bf masto-fe/yarn.lock -rw-r--r-- 597.8 KiB
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
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>
fde89a8f — Claire 2 years ago 
Merge pull request #2426 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 57f592fed50747f3c97718a2761e17bafe6c8698
abdb5884 — Claire 2 years ago 
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2054ee7c — renovate[bot] 2 years ago 
Update dependency glob to v10.3.9 (#27148)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
33a066a9 — renovate[bot] 2 years ago 
Update dependency glob to v10.3.8 (#27145)

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

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
82c44f49 — renovate[bot] 2 years ago 
Update dependency glob to v10.3.7 (#27078)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
c56d7d70 — renovate[bot] 2 years ago 
Update dependency @reduxjs/toolkit to v1.9.6 (#27110)

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

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
c04b08a3 — Claire 2 years ago 
Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
f05985f8 — Claire 2 years ago 
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
c74670b4 — renovate[bot] 2 years ago 
Update dependency glob to v10.3.5 (#27002)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
4ed9d9ca — renovate[bot] 2 years ago 
Update dependency autoprefixer to v10.4.16 (#27000)

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