~cytrogen/masto-fe

ref: 09ebf7e37c8bdaaf15f02cfec0d117ed55d63dae masto-fe/spec d---------
42f36aa5 — Claire 2 years ago
Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
7635c674 — Claire 2 years ago
Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream

Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
993d0a99 — Claire 2 years ago
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream

Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
5b457961 — Claire 2 years ago
Fix linting issue (#26106)

e5f1000a — Claire 2 years ago
Fix CSP headers being unintendedly wide (#26105)

144a406d — Claire 2 years ago
Clean up unused application records (#24871)

1e3b1923 — Claire 2 years ago
Add stricter protocol fields validation for accounts (#25937)

1cceb62a — Matt Jankowski 2 years ago
Fix `Lint/Void` cop (#25922)

285a3df5 — Matt Jankowski 2 years ago
Move localized subject mailer shared example to separate file (#25889)

4c18928a — Christian Schmidt 2 years ago
Wrong count in response when removing favourite/reblog (#24365)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
6edd4044 — Matt Jankowski 2 years ago
Cleanup unused portions of statuses/status partial (#26045)

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

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

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
59b38f9e — Daniel M Brasil 2 years ago
Migrate to request specs in `/api/v1/mutes` (#25622)

58bfe8c4 — Daniel M Brasil 2 years ago
Migrate to request specs in `/api/v1/bookmarks` (#25520)

5a7c6c65 — Daniel M Brasil 2 years ago
Migrate to request specs in `/api/v1/timelines/public` (#25746)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1a33f1df — Claire 2 years ago
Merge pull request #2305 from ClearlyClaire/glitch-soc/merge-upstream

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

Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
19208aa4 — Daniel M Brasil 2 years ago
Migrate to request specs in `/api/v1/statuses/:status_id/favourite` (#25626)

6fb4a756 — Daniel M Brasil 2 years ago
Migrate to request specs in `/api/v1/statuses/:status_id/bookmark` (#25624)

Next