diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-11 21:41:23 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-11 21:41:23 +0200 |
| commit | cdf20f4367226bc5682a0b040fa62f56d6f58fb5 (patch) | |
| tree | 630fca746dc138284eb7402c878f212578ebd74c /yarn.lock | |
| parent | f040b9aee3f84cb3ba8926fed81d47df3f1094a7 (diff) | |
| parent | a2ce7508c95f473a77d46a99fc1e090c0defadcc (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/serializers/rest/instance_serializer.rb`: Upstream changed the fields returned by /api/v1/instance by adding a `configuration` field holding a lot of useful information making our `max_toot_chars` and `poll_limits` fields obsolete. Keeping those around for now for compatibility. - `app/validators/status_length_validator.rb`: No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to MAX_CHARS which is defined differently in glitch-soc. Ported upstream changes.
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/yarn.lock b/yarn.lock index 59dda7beb..ce0a12e63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9821,10 +9821,10 @@ sass-loader@^10.2.0: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.35.1: - version "1.35.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.1.tgz#90ecf774dfe68f07b6193077e3b42fb154b9e1cd" - integrity sha512-oCisuQJstxMcacOPmxLNiLlj4cUyN2+8xJnG7VanRoh2GOLr9RqkvI4AxA4a6LHVg/rsu+PmxXeGhrdSF9jCiQ== +sass@^1.35.2: + version "1.35.2" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz#b732314fcdaf7ef8d0f1698698adc378043cb821" + integrity sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw== dependencies: chokidar ">=3.0.0 <4.0.0" |