f4abf8e782
Merge pull request #1504 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-03-02 16:33:06 +01:00
7336276252
[Glitch] Update twitter-text from 1.14 to 3.1.0 and fix toot character counting
...
Port 65db262550
2021-03-02 12:37:23 +01:00
7cffe8dca7
[Glitch] Add borders to 📱 and 📲 emojis
...
Port a8139ab016
2021-03-02 12:27:29 +01:00
974ddc28a3
[Glitch] Fix WebUI crashing when SVG support is disabled
...
Port 0635c8760d
2021-03-02 12:26:12 +01:00
d8fdbb054e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_length_validator.rb`:
Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
conflict.
Applied upstream changes.
- `package.json`:
glitch-soc-only dependency textually too close to a dependency updated
upstream, not a real conflict.
Applied upstream changes.
2021-03-02 12:06:58 +01:00
65db262550
Update twitter-text from 1.14 to 3.1.0 and fix toot character counting ( #15382 )
...
* Update twitter-text from 1.14 to 3.1.0
* Disable emoji parsing
* Properly depend on twitter-text for url detection
* Fix some URLs being wrongly detected client-side
* Add test for server-side validation of non-autolinkable URLs
* Fix server-side status length counting
2021-03-02 12:02:56 +01:00
a8139ab016
Add borders to 📱 and 📲 emojis ( #15794 )
2021-03-01 21:22:54 +01:00
ee1119208c
Add `POST /api/v1/emails/confirmations` to REST API ( #15816 )
...
Only available to the application the user originally signed-up with
2021-03-01 18:39:47 +01:00
287aa75f2e
Bump json-ld from 3.1.8 to 3.1.9 ( #15812 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.8 to 3.1.9.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.8...3.1.9 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01 23:50:00 +09:00
8f5022e687
Bump fastimage from 2.2.2 to 2.2.3 ( #15819 )
...
Bumps [fastimage](https://github.com/sdsykes/fastimage ) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/sdsykes/fastimage/releases )
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01 23:37:06 +09:00
9ff5338508
Bump webmock from 3.11.2 to 3.12.0 ( #15817 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.11.2 to 3.12.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.11.2...v3.12.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01 23:36:45 +09:00
a65ff30b2a
Bump aws-sdk-s3 from 1.88.1 to 1.89.0 ( #15814 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.88.1 to 1.89.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01 23:35:00 +09:00
7f9bb105b7
Bump bullet from 6.1.3 to 6.1.4 ( #15815 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.1.3 to 6.1.4.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.3...6.1.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-03-01 23:34:29 +09:00
9aa37b32c3
Add `details` to error response for `POST /api/v1/accounts` in REST API ( #15803 )
2021-03-01 04:59:13 +01:00
b4cb8c3c83
Bump @babel/plugin-transform-runtime from 7.13.7 to 7.13.8 ( #15806 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.13.7 to 7.13.8.
- [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.13.8/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-28 13:27:52 +09:00
6fb4efd09f
Bump eslint from 7.20.0 to 7.21.0 ( #15810 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.20.0 to 7.21.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.20.0...v7.21.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-28 13:12:44 +09:00
2577b79b75
Bump @babel/preset-env from 7.13.5 to 7.13.8 ( #15804 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.13.5 to 7.13.8.
- [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.13.8/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-28 12:03:59 +09:00
0635c8760d
Fix WebUI crashing when SVG support is disabled ( #15809 )
...
Fixes #14910
2021-02-28 01:01:34 +01:00
73264e0716
Bump @babel/core from 7.12.17 to 7.13.8 ( #15805 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.12.17 to 7.13.8.
- [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.13.8/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-27 23:36:17 +09:00
b9231c4543
Bump @babel/runtime from 7.13.7 to 7.13.8 ( #15807 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.13.7 to 7.13.8.
- [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.13.8/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-27 23:35:33 +09:00
882a3cdc20
Bump css-loader from 5.0.2 to 5.1.0 ( #15802 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v5.0.2...v5.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-27 13:48:34 +09:00
715f6cfa66
Bump mini-css-extract-plugin from 1.3.8 to 1.3.9 ( #15801 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 1.3.8 to 1.3.9.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.3.8...v1.3.9 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-27 13:48:23 +09:00
9de8a8cb3c
Bump @babel/plugin-proposal-decorators from 7.12.13 to 7.13.5 ( #15784 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.12.13 to 7.13.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.13.5/packages/babel-plugin-proposal-decorators )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-27 13:47:58 +09:00
210084bb9e
Bump @babel/plugin-transform-runtime from 7.12.17 to 7.13.7 ( #15797 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.12.17 to 7.13.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.13.7/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-27 13:47:46 +09:00
f24674d0e2
Bump object.values from 1.1.2 to 1.1.3 ( #15786 )
...
Bumps [object.values](https://github.com/es-shims/Object.values ) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/es-shims/Object.values/releases )
- [Changelog](https://github.com/es-shims/Object.values/blob/main/CHANGELOG.md )
- [Commits](https://github.com/es-shims/Object.values/compare/v1.1.2...v1.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-27 03:46:25 +09:00
f896d8587a
Bump @babel/preset-env from 7.12.17 to 7.13.5 ( #15790 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.12.17 to 7.13.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.13.5/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-27 03:45:26 +09:00
44609f7665
Bump @babel/runtime from 7.12.18 to 7.13.7 ( #15796 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.12.18 to 7.13.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.13.7/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-27 03:44:53 +09:00
75189af528
Fix crash on receiving requests with missing Digest header ( #15782 )
...
* Fix crash on receiving requests with missing Digest header
Return an error pointing out that Digest is missing, instead of crashing.
Fixes #15743
* Fix from review feedback
2021-02-26 17:40:27 +01:00
7d9ba8c243
Update pg node package from 2017 version to 2020 version ( #15793 )
...
* Update pg node package from 2017 version to 2020 version so websockets will work with newer postgresql versions
* Add newline back to end of package.json
* updated yarn.lock file
2021-02-25 00:03:02 +01:00
4f19504986
Add inline description of moderation actions in moderation interface ( #15792 )
2021-02-24 16:53:16 +01:00
5f4c0b79c2
Change ResolveAccountService's handling of skip_webfinger ( #15750 )
...
* Change ResolveAccountService's handling of skip_webfinger
Change it so it never makes any webfinger query, as the name would imply.
* Add tests
* Change FollowService to not take an URI for target_account
* Restore domain-block check in FollowService
* Fix tests
2021-02-24 06:32:13 +01:00
eb83ab45e2
Bump doorkeeper from 5.4.0 to 5.5.0 ( #15757 )
...
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.4.0 to 5.5.0.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.4.0...v5.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-24 06:58:39 +09:00
2fed2b5d91
Bump array-includes from 3.1.2 to 3.1.3 ( #15773 )
...
Bumps [array-includes](https://github.com/es-shims/array-includes ) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/es-shims/array-includes/releases )
- [Changelog](https://github.com/es-shims/array-includes/blob/main/CHANGELOG.md )
- [Commits](https://github.com/es-shims/array-includes/compare/v3.1.2...v3.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-24 06:57:36 +09:00
684dcd6ab0
Bump lodash from 4.17.20 to 4.17.21 ( #15774 )
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-24 06:56:29 +09:00
4aa860b65b
Merge pull request #1501 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-02-22 19:36:03 +01:00
1b50ac08c1
Fix server rules not being displayed if extended server discription isn't set ( #15778 )
2021-02-22 18:26:24 +01:00
6ae04d990c
[Glitch] Fix default searchTokens
...
Port 2127f40e6b
2021-02-22 15:47:17 +01:00
24fb5d7572
[Glitch] Add server rules
...
Port SCSS changes from 8331fdf7e0
2021-02-22 15:45:28 +01:00
679642e26c
Merge branch 'main' into glitch-soc/merge-upstream
2021-02-22 15:23:46 +01:00
2127f40e6b
Fix default searchTokens ( #15775 )
2021-02-22 11:26:08 +01:00
8331fdf7e0
Add server rules ( #15769 )
2021-02-21 19:50:12 +01:00
dcc7c686f3
Bump rails from 5.2.4.4 to 5.2.4.5 ( #15729 )
...
Bumps [rails](https://github.com/rails/rails ) from 5.2.4.4 to 5.2.4.5.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.4.4...v5.2.4.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 21:38:05 +09:00
76e5906cad
Bump @babel/preset-env from 7.12.16 to 7.12.17 ( #15766 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.12.16 to 7.12.17.
- [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.12.17/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 21:37:37 +09:00
215a0e3b9f
Bump sass from 1.32.7 to 1.32.8 ( #15760 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.32.7 to 1.32.8.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.32.7...1.32.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 16:02:48 +09:00
cfc1771484
Bump mini-css-extract-plugin from 1.3.6 to 1.3.8 ( #15761 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 1.3.6 to 1.3.8.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.3.6...v1.3.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 16:02:03 +09:00
53804ac23e
Bump wicg-inert from 3.1.0 to 3.1.1 ( #15763 )
...
Bumps [wicg-inert](https://github.com/WICG/inert ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/WICG/inert/releases )
- [Commits](https://github.com/WICG/inert/compare/v3.1.0...v3.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 16:01:35 +09:00
8aff02ef54
Bump @babel/runtime from 7.12.13 to 7.12.18 ( #15765 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.12.13 to 7.12.18.
- [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.12.18/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 16:00:56 +09:00
153aa8f329
Bump @babel/plugin-transform-runtime from 7.12.15 to 7.12.17 ( #15764 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.12.15 to 7.12.17.
- [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.12.17/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 16:00:16 +09:00
6993debbe2
Bump @rails/ujs from 6.1.2 to 6.1.3 ( #15759 )
...
Bumps [@rails/ujs](https://github.com/rails/rails ) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.2...v6.1.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 15:59:43 +09:00
03d5dba7c8
Bump @babel/core from 7.12.16 to 7.12.17 ( #15762 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.12.16 to 7.12.17.
- [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.12.17/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-20 15:58:19 +09:00
Claire
Eugen Rochko
dependabot[bot]
Dale Henries
abcang