Claire
24c1b04f9c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our README.
2022-03-15 20:45:27 +01:00
dependabot[bot]
ebfc737077
Bump @rails/ujs from 6.1.4 to 6.1.5 ( #17776 )
...
Bumps [@rails/ujs](https://github.com/rails/rails ) from 6.1.4 to 6.1.5.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.4...v6.1.5 )
---
updated-dependencies:
- dependency-name: "@rails/ujs"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:48:15 +09:00
dependabot[bot]
459399c338
Bump @testing-library/react from 12.1.3 to 12.1.4 ( #17775 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 12.1.3 to 12.1.4.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v12.1.3...v12.1.4 )
---
updated-dependencies:
- dependency-name: "@testing-library/react"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:47:21 +09:00
dependabot[bot]
fe4af642cc
Bump utf-8-validate from 5.0.8 to 5.0.9 ( #17777 )
...
Bumps [utf-8-validate](https://github.com/websockets/utf-8-validate ) from 5.0.8 to 5.0.9.
- [Release notes](https://github.com/websockets/utf-8-validate/releases )
- [Commits](https://github.com/websockets/utf-8-validate/compare/v5.0.8...v5.0.9 )
---
updated-dependencies:
- dependency-name: utf-8-validate
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:47:07 +09:00
dependabot[bot]
08dcaf9398
Bump @babel/core from 7.17.5 to 7.17.7 ( #17782 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.17.5 to 7.17.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.7/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:46:34 +09:00
dependabot[bot]
72fc4b51cf
Bump @babel/runtime from 7.17.2 to 7.17.7 ( #17783 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.17.2 to 7.17.7.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.7/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:46:21 +09:00
dependabot[bot]
878d70c53e
Bump axios from 0.26.0 to 0.26.1 ( #17784 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.26.0 to 0.26.1.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.26.0...v0.26.1 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-15 13:46:11 +09:00
Claire
f677c1619a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream updated media and edit-related code textually close to glitch-soc
additions (local-only and content-type).
Ported upstream changes.
- `app/models/status_edit.rb`:
Upstream changes textually close to glitch-soc additions (content-type).
Ported upstream changes.
- `app/serializers/activitypub/note_serializer.rb`:
Upstream changed how media attachments are handled. Not really a conflict,
but textually close to glitch-soc additions (directMessage attribute).
Ported upstream changes.
- `app/services/remove_status_service.rb`:
Upstream changed how media attachments are handled. Not really a conflict,
but textually close to glitch-soc additions (DM timeline).
Ported upstream changes.
- `app/services/update_status_service.rb`:
Upstream fixed an issue with language selection. Not really a conflict,
but textually close to glitch-soc additions (content-type).
Ported upstream changes.
- `db/schema.rb`:
Upstream added columns to the `status_edits` table, the conflict is because
of an additional column (`content-type`) in glitch-soc.
Ported upstream changes.
- `package.json`:
Upstream dependency (express) textually adjacent to a glitch-soc-specific one
(favico.js) got updated.
Updated it as well.
2022-03-10 09:52:45 +01:00
dependabot[bot]
5b67e8c005
Bump express from 4.17.2 to 4.17.3 ( #17609 )
...
Bumps [express](https://github.com/expressjs/express ) from 4.17.2 to 4.17.3.
- [Release notes](https://github.com/expressjs/express/releases )
- [Changelog](https://github.com/expressjs/express/blob/master/History.md )
- [Commits](https://github.com/expressjs/express/compare/4.17.2...4.17.3 )
---
updated-dependencies:
- dependency-name: express
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:36:40 +09:00
dependabot[bot]
028f0ba59a
Bump blurhash from 1.1.4 to 1.1.5 ( #17610 )
...
Bumps [blurhash](https://github.com/woltapp/blurhash ) from 1.1.4 to 1.1.5.
- [Release notes](https://github.com/woltapp/blurhash/releases )
- [Commits](https://github.com/woltapp/blurhash/commits )
---
updated-dependencies:
- dependency-name: blurhash
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:36:02 +09:00
dependabot[bot]
1bb4d08b9d
Bump marky from 1.2.2 to 1.2.4 ( #17606 )
...
Bumps [marky](https://github.com/nolanlawson/marky ) from 1.2.2 to 1.2.4.
- [Release notes](https://github.com/nolanlawson/marky/releases )
- [Commits](https://github.com/nolanlawson/marky/compare/v1.2.2...v1.2.4 )
---
updated-dependencies:
- dependency-name: marky
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:33:49 +09:00
dependabot[bot]
f9665f6618
Bump @testing-library/react from 12.1.2 to 12.1.3 ( #17605 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 12.1.2 to 12.1.3.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v12.1.2...v12.1.3 )
---
updated-dependencies:
- dependency-name: "@testing-library/react"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:33:19 +09:00
dependabot[bot]
b3af6619ac
Bump @babel/core from 7.17.2 to 7.17.5 ( #17607 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.17.2 to 7.17.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.5/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:32:12 +09:00
dependabot[bot]
edb55dfd6d
Bump eslint-plugin-react from 7.29.2 to 7.29.3 ( #17717 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.29.2 to 7.29.3.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.29.2...v7.29.3 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:17:58 +09:00
Claire
d2eb561d32
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-01 09:59:18 +01:00
dependabot[bot]
3256a69265
Bump redis from 4.0.3 to 4.0.4 ( #17671 )
...
Bumps [redis](https://github.com/redis/node-redis ) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/redis/node-redis/releases )
- [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/node-redis/compare/redis@4.0.3...redis@4.0.4 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 17:33:26 +09:00
dependabot[bot]
03084417c7
Bump eslint-plugin-react from 7.28.0 to 7.29.2 ( #17672 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.28.0 to 7.29.2.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.28.0...v7.29.2 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 17:33:10 +09:00
dependabot[bot]
05f5e9fad2
Bump sass from 1.49.7 to 1.49.9 ( #17670 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.49.7 to 1.49.9.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.49.7...1.49.9 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 17:32:51 +09:00
dependabot[bot]
87a61f6466
Bump url-parse from 1.5.7 to 1.5.10 ( #17662 )
...
Bumps [url-parse](https://github.com/unshiftio/url-parse ) from 1.5.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases )
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.7...1.5.10 )
---
updated-dependencies:
- dependency-name: url-parse
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 17:32:30 +09:00
Claire
ddf6fa684b
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-19 11:33:18 +01:00
dependabot[bot]
c45c91c588
Bump url-parse from 1.5.3 to 1.5.7 ( #17584 )
...
Bumps [url-parse](https://github.com/unshiftio/url-parse ) from 1.5.3 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases )
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7 )
---
updated-dependencies:
- dependency-name: url-parse
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-19 13:23:06 +09:00
Claire
175446f293
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Conflict due to glitch-soc adding the `content_type` column on status edits
and thus having a different schema version number.
Solved by taking upstream's schema version number, as it is higher than
glitch-soc's.
2022-02-17 10:58:44 +01:00
dependabot[bot]
2d7e210cd8
Bump axios from 0.25.0 to 0.26.0 ( #17551 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.25.0 to 0.26.0.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.25.0...v0.26.0 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16 19:20:37 +09:00
dependabot[bot]
7cf98285dd
Bump npmlog from 6.0.0 to 6.0.1 ( #17545 )
...
Bumps [npmlog](https://github.com/npm/npmlog ) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/npm/npmlog/releases )
- [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md )
- [Commits](https://github.com/npm/npmlog/compare/v6.0.0...v6.0.1 )
---
updated-dependencies:
- dependency-name: npmlog
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:07:14 +09:00
dependabot[bot]
36a988e6db
Bump @babel/plugin-proposal-decorators from 7.17.0 to 7.17.2 ( #17548 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.17.0 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:06:25 +09:00
dependabot[bot]
3a5f4b6cf0
Bump babel-jest from 27.5.0 to 27.5.1 ( #17549 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.5.0 to 27.5.1.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.5.1/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:06:06 +09:00
dependabot[bot]
a6ebb35844
Bump @babel/runtime from 7.17.0 to 7.17.2 ( #17544 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.17.0 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:05:18 +09:00
dependabot[bot]
5b0102a0fa
Bump dotenv from 10.0.0 to 16.0.0 ( #17476 )
...
Bumps [dotenv](https://github.com/motdotla/dotenv ) from 10.0.0 to 16.0.0.
- [Release notes](https://github.com/motdotla/dotenv/releases )
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md )
- [Commits](https://github.com/motdotla/dotenv/compare/v10.0.0...v16.0.0 )
---
updated-dependencies:
- dependency-name: dotenv
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-14 21:49:40 +01:00
Claire
56442ee90a
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-12 21:36:33 +01:00
dependabot[bot]
40586250c1
Bump ws from 8.4.2 to 8.5.0 ( #17467 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.4.2 to 8.5.0.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.4.2...8.5.0 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-12 20:50:49 +09:00
dependabot[bot]
7c2ba2f8b1
Bump babel-plugin-preval from 5.0.0 to 5.1.0 ( #17475 )
...
Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval ) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases )
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/main/CHANGELOG.md )
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v5.0.0...v5.1.0 )
---
updated-dependencies:
- dependency-name: babel-plugin-preval
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-12 20:21:56 +09:00
Claire
7c32406859
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-12 11:12:41 +01:00
dependabot[bot]
c24ff1efe1
Bump follow-redirects from 1.14.7 to 1.14.8 ( #17527 )
...
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects ) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases )
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8 )
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-12 01:09:31 +01:00
Claire
e9a7485dcc
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-11 21:53:20 +01:00
dependabot[bot]
a0bfea627e
Bump @babel/plugin-transform-runtime from 7.16.10 to 7.17.0 ( #17474 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.16.10 to 7.17.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.0/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 11:59:31 +09:00
dependabot[bot]
6db07536d2
Bump @babel/core from 7.16.12 to 7.17.2 ( #17510 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.16.12 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 11:59:26 +09:00
dependabot[bot]
2e5cfd2523
Bump jest from 27.4.7 to 27.5.1 ( #17512 )
...
Bumps [jest](https://github.com/facebook/jest ) from 27.4.7 to 27.5.1.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v27.4.7...v27.5.1 )
---
updated-dependencies:
- dependency-name: jest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 11:59:12 +09:00
dependabot[bot]
154831f1ba
Bump @testing-library/jest-dom from 5.16.1 to 5.16.2 ( #17469 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.16.1 to 5.16.2.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.16.1...v5.16.2 )
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:54:19 +09:00
dependabot[bot]
cc023cf85a
Bump sass from 1.49.0 to 1.49.7 ( #17470 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.49.0 to 1.49.7.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.49.0...1.49.7 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:53:51 +09:00
dependabot[bot]
ecefa1dce7
Bump babel-jest from 27.4.6 to 27.5.0 ( #17477 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.4.6 to 27.5.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.5.0/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:53:06 +09:00
dependabot[bot]
2d937b7ccd
Bump @babel/runtime from 7.16.7 to 7.17.0 ( #17473 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.16.7 to 7.17.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.0/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:50:45 +09:00
dependabot[bot]
91d856abc0
Bump @babel/plugin-proposal-decorators from 7.16.7 to 7.17.0 ( #17468 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.16.7 to 7.17.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.0/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-11 10:50:09 +09:00
Claire
b7882a75d2
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Upstream moved things around in a place where glitch-soc had support for
an extra parameter (`content_type`).
Follow upstream but reintroduce `content_type`.
2022-02-10 19:09:27 +01:00
Eugen Rochko
f52e8d4663
Chore: Update browserslist ( #17493 )
2022-02-10 00:10:27 +01:00
Claire
aaace9f1db
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `CHANGELOG.md`:
Upstream added newlines.
Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
last security update.
Took upstream's version.
- `app/helpers/context_helper.rb`:
Conflicts because of extra vocabulary in glitch-soc. The conflicts were
actually handled in last security merge.
Kept our version.
2022-02-06 15:34:42 +01:00
dependabot[bot]
6c36323b05
Bump redis from 4.0.2 to 4.0.3 ( #17412 )
...
Bumps [redis](https://github.com/redis/node-redis ) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/redis/node-redis/releases )
- [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/node-redis/compare/redis@4.0.2...redis@4.0.3 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-05 13:03:06 +09:00
dependabot[bot]
ee72920b41
Bump http-link-header from 1.0.3 to 1.0.4 ( #17414 )
...
Bumps [http-link-header](https://github.com/jhermsmeier/node-http-link-header ) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/jhermsmeier/node-http-link-header/releases )
- [Changelog](https://github.com/jhermsmeier/node-http-link-header/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jhermsmeier/node-http-link-header/compare/v1.0.3...v1.0.4 )
---
updated-dependencies:
- dependency-name: http-link-header
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-05 13:02:42 +09:00
Claire
daab277c0e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Upstream-updated lib textually too close to glitch-soc-only dep.
Updated like upstream.
2022-01-28 08:58:32 +01:00
dependabot[bot]
f5401e89f3
Bump axios from 0.24.0 to 0.25.0 ( #17354 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.24.0 to 0.25.0.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.24.0...v0.25.0 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-27 20:26:18 +09:00
Claire
56a49e9334
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream changed a header but we had different default headers.
Applied the same change, and also dropped HSTS headers redundant with
Rails'.
2022-01-26 22:32:21 +01:00