060df6c5c9
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
glitch-soc-only dependency textually too close to updated upstream
dependencies. Updated to upsteam dependencies.
2020-11-25 15:31:45 +01:00
c1d1fc484c
Revert "Bump webpack-cli from 3.3.12 to 4.2.0 ( #15123 )" ( #15213 )
...
This reverts commit 2d83da3bc5
2020-11-24 21:06:18 +01:00
876df5bb18
Add `tootctl accounts merge` ( #15201 )
...
* Add `tootctl accounts merge`
* Update lib/mastodon/accounts_cli.rb
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-11-23 17:50:16 +01:00
144e606ec9
Fixed ESLint error ( #15214 )
...
* eslint --fix
* fix consistent-return
* fix promise/catch-or-return
* ignore import rule
2020-11-23 17:35:14 +01:00
6afc4a7846
Bump @babel/preset-env from 7.12.1 to 7.12.7 ( #15209 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.12.1 to 7.12.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.12.7/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 21:03:44 +09:00
f307883e2f
Bump parallel from 1.20.0 to 1.20.1 ( #15204 )
...
Bumps [parallel](https://github.com/grosser/parallel ) from 1.20.0 to 1.20.1.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.20.0...v1.20.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 21:02:47 +09:00
3e042e4ff7
Bump eslint from 7.13.0 to 7.14.0 ( #15210 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.13.0 to 7.14.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.13.0...v7.14.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:07:56 +09:00
2d9c22de6c
Bump @babel/preset-react from 7.12.5 to 7.12.7 ( #15208 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.12.5 to 7.12.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.12.7/packages/babel-preset-react )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:05:04 +09:00
96fae5c28a
Bump @babel/core from 7.12.3 to 7.12.7 ( #15205 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.12.3 to 7.12.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.12.7/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:04:47 +09:00
d1db8452e8
Bump @testing-library/react from 11.2.0 to 11.2.2 ( #15211 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 11.2.0 to 11.2.2.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.2.0...v11.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:03:37 +09:00
65f5857b19
Bump parallel_tests from 3.3.0 to 3.4.0 ( #15203 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md )
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.3.0...v3.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:02:30 +09:00
a0aff403eb
Bump redis from 4.2.2 to 4.2.5 ( #15202 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.2.2 to 4.2.5.
- [Release notes](https://github.com/redis/redis-rb/releases )
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/redis-rb/compare/v4.2.2...v4.2.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:00:55 +09:00
86807b918f
Bump rubocop from 1.3.0 to 1.3.1 ( #15212 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v1.3.0...v1.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:00:23 +09:00
2813d4014d
Bump aws-sdk-s3 from 1.84.1 to 1.85.0 ( #15207 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.84.1 to 1.85.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>
2020-11-23 16:59:45 +09:00
107759e4ee
Remove fade-in animation from modals in web UI ( #15199 )
2020-11-21 23:54:36 +01:00
bcb3a91c0c
Fix hardcoded frame rate for frame by frame video navigation in web UI ( #15198 )
2020-11-21 23:19:04 +01:00
da80f4852e
Undo outgoing follows when suspending a remote account ( #15188 )
2020-11-21 21:27:00 +01:00
a609802736
Fix not being able to unfavorite toots one has lost access to ( #15192 )
...
Fixes #15191
2020-11-21 06:18:09 +01:00
4ec6a8e188
Merge pull request #1467 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-11-20 15:11:43 +01:00
7875455336
Fix video not taking focus on interaction
...
Revert part of #737 to restore hotkey functionality
2020-11-20 14:20:17 +01:00
096b2f775f
[Glitch] Fix image uploads being random data when canvas read access is blocked
...
Port 71e63ec4dd
2020-11-20 13:41:07 +01:00
c1d8a04660
[Glitch] Add hotkeys for audio/video control
...
Port e8facfb2e9
2020-11-20 13:40:05 +01:00
3216868024
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
Upstream added the `bug` label to bug reports.
Did the same.
- `app/services/fan_out_on_write_service.rb`:
Upstream put DMs back into timelines, glitch-soc was already doing it.
Ignored upstream changes.
2020-11-20 13:27:48 +01:00
f2e1d77706
Fix webfinger redirect handling in ResolveAccountService ( #15187 )
...
* Fix webfinger redirect handling in ResolveAccountService
ResolveAccountService#process_webfinger! handled a one-step webfinger
redirection, but only accepting the result if it matched the exact URI passed
as input, defeating the point of a redirection check.
Instead, use the same logic as in `ActivityPub::FetchRemoteAccountService`,
updating the resulting `acct:` URI with the result of the first webfinger
query.
* Add tests
2020-11-19 19:52:06 +01:00
8e79bac43d
Add import/export feature for bookmarks ( #14956 )
...
* Add ability to export bookmarks
* Add support for importing bookmarks
* Add bookmark import tests
* Add bookmarks export test
2020-11-19 17:48:13 +01:00
2d83da3bc5
Bump webpack-cli from 3.3.12 to 4.2.0 ( #15123 )
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.3.12 to 4.2.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.12...webpack-cli@4.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 17:47:20 +01:00
75585748c9
Use Ruby 2.7.2 ( #15150 )
...
thwait and e2mmap are no longer needed in Gemfile.
Gems properly require those.
2020-11-19 17:46:46 +01:00
dcdd6e2a47
Bump omniauth-cas from 1.1.1 to 2.0.0 ( #15165 )
...
Bumps [omniauth-cas](https://github.com/dlindahl/omniauth-cas ) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/dlindahl/omniauth-cas/releases )
- [Changelog](https://github.com/dlindahl/omniauth-cas/blob/master/CHANGELOG.md )
- [Commits](https://github.com/dlindahl/omniauth-cas/compare/v1.1.1...v2.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 17:43:58 +01:00
ae40e9324b
Bump rubocop from 0.93.1 to 1.3.0 ( #15170 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.93.1 to 1.3.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.93.1...v1.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 17:43:35 +01:00
f6aa34dc45
Bump @testing-library/react from 11.1.1 to 11.2.0 ( #15186 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 11.1.1 to 11.2.0.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.1.1...v11.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 17:42:47 +01:00
8681af3303
Mark correctly as read reverse-order announcements ( #15070 )
...
This fixes a bug in #15065 where the "read" indicator was not getting correctly set. The ID of a dismissed announcement is now correct.
2020-11-19 17:40:18 +01:00
b0bc965658
Fix sending spurious Rejects when processing remote account deletion ( #15104 )
...
* Fix sending spurious Rejects when processing remote account deletion
* Make skip_side_effects imply skip_activitypub
2020-11-19 17:39:47 +01:00
471b8570ad
Add cache buster feature for media files ( #15155 )
...
Nginx can be configured to bypass proxy cache when a special header
is in the request. If the response is cacheable, it will replace
the cache for that request. Proxy caching of media files is
desirable when using object storage as a way of minimizing bandwidth
costs, but has the drawback of leaving deleted media files for
a configured amount of cache time. A cache buster can make those
media files immediately unavailable. This especially makes sense
when suspending and unsuspending an account.
2020-11-19 17:38:06 +01:00
14da84d0dc
Deal with collation-related index corruption ( #14860 )
...
* Add tootctl maintenance fix-duplicates
This tool goes through the database to detect and fix duplicates.
This operation is very slow and may cause data loss (of data that would be
inaccessible without intervention because of the existing index corruptions).
It tries its best to make sensible decisions, and asks the user in some cases.
* Add warning message in db:migrate hook
* Clear Rails cache after being done with database deduplication
Avoids followers hash cache being incorrect, among other things
2020-11-19 17:37:49 +01:00
84b537be19
Bump babel-loader from 8.1.0 to 8.2.1 ( #15167 )
...
Bumps [babel-loader](https://github.com/babel/babel-loader ) from 8.1.0 to 8.2.1.
- [Release notes](https://github.com/babel/babel-loader/releases )
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel-loader/compare/v8.1.0...v8.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 11:08:20 +09:00
ecc1ce2ca4
Bump webpack-merge from 5.3.0 to 5.4.0 ( #15166 )
...
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge ) from 5.3.0 to 5.4.0.
- [Release notes](https://github.com/survivejs/webpack-merge/releases )
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.3.0...v5.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 11:07:57 +09:00
486a7d064d
Bump sass-loader from 10.0.5 to 10.1.0 ( #15164 )
...
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 10.0.5 to 10.1.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases )
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v10.0.5...v10.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 11:03:07 +09:00
ca8352ffca
Bump mini-css-extract-plugin from 1.3.0 to 1.3.1 ( #15168 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 1.3.0 to 1.3.1.
- [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.0...v1.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:56:04 +09:00
4e02c8a6b6
Bump bootsnap from 1.5.0 to 1.5.1 ( #15171 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.5.0...v1.5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:45:57 +09:00
9078bd6d3c
Bump yargs from 16.1.0 to 16.1.1 ( #15163 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 16.1.0 to 16.1.1.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v16.1.0...v16.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:44:38 +09:00
a22d74c822
Bump webmock from 3.9.5 to 3.10.0 ( #15172 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.5 to 3.10.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.9.5...v3.10.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:42:05 +09:00
ecf0b8afcd
Bump @testing-library/jest-dom from 5.11.5 to 5.11.6 ( #15162 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.11.5 to 5.11.6.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.5...v5.11.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:34:31 +09:00
eff6be0a40
Bump compression-webpack-plugin from 6.1.0 to 6.1.1 ( #15161 )
...
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin ) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v6.1.0...v6.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:32:00 +09:00
c03b59a589
Bump aws-sdk-s3 from 1.84.0 to 1.84.1 ( #15173 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.84.0 to 1.84.1.
- [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>
2020-11-19 10:28:31 +09:00
499fda5e89
Bump json-ld from 3.1.4 to 3.1.5 ( #15174 )
...
Bumps [json-ld](https://github.com/ruby-rdf/json-ld ) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases )
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.4...3.1.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:25:12 +09:00
8095a0ab5b
Bump oj from 3.10.15 to 3.10.16 ( #15175 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.15 to 3.10.16.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.15...v3.10.16 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 10:22:24 +09:00
fdab81200a
Fix DMs not appearing into timelines ( #15182 )
...
Fixes #15179
2020-11-19 00:23:46 +01:00
71e63ec4dd
Fix image uploads being random data when canvas read access is blocked ( #15180 )
...
Fixes #15178
PR #11499 introduced a way to deal with all-white canvas, but newer
Firefox versions set random data instead.
This PR detects whether canvas operations are reliable by comparing
the results on a hardcoded 2×2 pixels image, and memoizing the result.
This should be both more reliable and faster than the previous check.
2020-11-18 18:01:58 +01:00
d416f3f662
Fix pop-out player appearing on mobile screens in web UI ( #15157 )
...
Fix #15092
2020-11-16 05:16:39 +01:00
e8facfb2e9
Add hotkeys for audio/video control ( #15158 )
...
Fix #14515
2020-11-15 14:24:54 +01:00
Thibaut Girka