~cytrogen/masto-fe

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`.
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
c2bfbf53 — Claire 2 years ago
Fix various CSS issues
8d0c6952 — Eugen Rochko 2 years ago
Change markers API to use a replica (#25851)

fdc3ff7c — Eugen Rochko 2 years ago
Change notifications API to use a replica (#25874)

9ae60f87 — Claire 2 years ago
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
ec95f62c — Stanislas Signoud 2 years ago
[Glitch] Fix sounds not being loaded from assets host

Port 1392f31ed8052a95591f9aa571b7e2f14bfd7a33 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2aadebc7 — Claire 2 years ago
Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes
15f6fa8d — Trevor Wolf 2 years ago
[Glitch] fix buttons showing inconsistent styles

Port ea10febd257b5b729a50aeb3218389763f5f4b97 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
c3af91ce — Claire 2 years ago
[Glitch] Fix filters not applying to explore tab

Port af54bf52c83d9fa60efa4c9650e66ec0bcfd998d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
c699dc09 — Claire 2 years ago
[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports`

Port c27b82a43763b44b0b2a2929b9cde588260581b4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
075887e1 — Claire 2 years ago
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
Next