~cytrogen/masto-fe

ref: e48a6a5f2c878e0deecddbd92ba4d823bebd7f9e masto-fe/spec/lib 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)

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

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

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

Merge upstream changes
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.
6c5a2233 — Matt Jankowski 2 years ago
Fix `RSpec/StubbedMock` cop (#25552)

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

Merge upstream changes
178e1510 — Claire 2 years ago
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream

Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
05f9e39b — Matt Jankowski 2 years ago
Fix `RSpec/VerifiedDoubles` cop (#25469)

c78280a8 — Claire 2 years ago
Add translate="no" to outgoing mentions and links (#25524)

eba3411b — Plastikmensch 2 years ago
Re-allow title attribute in <abbr> (#2254)

* Re-allow title attribute in <abbr>

This was accidentally removed in 7623e181247b4d2227b7774143514f6e1ca9253b

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add test

Add a new test to check that title attribute on <abbr> is kept.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
e1c9d52e — Matt Jankowski 2 years ago
Reduce `sleep` time in request pool spec (#25470)

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

Merge upstream changes
6c99479e — Claire 2 years ago
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
65cbcce9 — Claire 2 years ago
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
4c5aa0e4 — Matt Jankowski 2 years ago
Update rubocop-rspec to version 2.22.0, fix `RSpec/IndexedLet` cop (#24698)

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

Merge upstream changes
Next