~cytrogen/masto-fe

25571b18 — Claire 2 years ago
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
447ab7ab — Renaud Chaput 2 years ago
[Glitch] Convert Home timeline components to Typescript

Port a75138d07336c2f10a8cbdba86f72f08c81cf9d7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
177497b3 — Claire 2 years ago
Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream
0870c7c9 — Claire 2 years ago
[Glitch] Upgrade to Prettier 3

Port 73b64b89170cb72854a1709186c62ce31f476889 to glitch-soc
95a1fde6 — Claire 2 years ago
Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
2d09653d — Claire 2 years ago
Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.
5a3f174d — Claire 2 years ago
Fix follow link style in embeds (#25965)

ba0649f0 — renovate[bot] 2 years ago
Update dependency postcss to v8.4.25 (#25961)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
a4e6ff0d — renovate[bot] 2 years ago
Update dependency react-textarea-autosize to v8.5.2 (#25962)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
a7253075 — Renaud Chaput 2 years ago
Upgrade to `typescript-eslint` v6 (#25904)

3ed9b55c — renovate[bot] 2 years ago
Update dependency rubocop-rails to v2.20.1 (#25493)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
a75138d0 — Renaud Chaput 2 years ago
Convert Home timeline components to Typescript (#25583)

73b64b89 — Renaud Chaput 2 years ago
Upgrade to Prettier 3 (#25902)

0d734038 — renovate[bot] 2 years ago
Update dependency glob to v10.3.3 (#25959)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
6be9f95a — renovate[bot] 2 years ago
Update dependency core-js to v3.31.1 (#25958)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
063482a6 — Michael Stanclift 2 years ago
Fix trending publishers table not rendering correctly on narrow screens (#25945)

1a6c2e45 — Nick Schonning 2 years ago
Update rubocop to v1.54.1 (#25627)

e7b0d1e2 — renovate[bot] 2 years ago
Update dependency chewy to v7.3.3 (#25940)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
ce43ed14 — Matt Jankowski 2 years ago
Rails 7.0 update (#25668)

bb98d970 — Claire 2 years ago
Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
Next