-
-
Notifications
You must be signed in to change notification settings - Fork 7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix various issues with account migration #12301
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ClearlyClaire
force-pushed
the
fixes/own-follow
branch
2 times, most recently
from
November 4, 2019 17:03
cf8e2dd
to
3bd476a
Compare
ykzts
approved these changes
Nov 4, 2019
ClearlyClaire
changed the title
Fix being able to follow oneself by moving to an account that was following the old one
Fix various issues with account migration
Nov 4, 2019
ClearlyClaire
force-pushed
the
fixes/own-follow
branch
2 times, most recently
from
November 4, 2019 18:01
1deea01
to
e51549b
Compare
…lowing the old one
ClearlyClaire
force-pushed
the
fixes/own-follow
branch
from
November 4, 2019 18:19
e51549b
to
2b97b5c
Compare
doubanius
pushed a commit
to doubanius/mastodon
that referenced
this pull request
Nov 10, 2019
* Bump @babel/preset-react from 7.0.0 to 7.6.3 (mastodon#12315) Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.0.0 to 7.6.3. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](babel/babel@v7.0.0...v7.6.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Bump sass from 1.23.1 to 1.23.3 (mastodon#12314) Bumps [sass](https://github.com/sass/dart-sass) from 1.23.1 to 1.23.3. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md) - [Commits](sass/dart-sass@1.23.1...1.23.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Bump glob from 7.1.4 to 7.1.5 (mastodon#12312) Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.4 to 7.1.5. - [Release notes](https://github.com/isaacs/node-glob/releases) - [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md) - [Commits](isaacs/node-glob@v7.1.4...v7.1.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (mastodon#12311) Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.16 to 2.0.0-beta.2. - [Release notes](https://github.com/naptha/tesseract.js/releases) - [Commits](naptha/tesseract.js@v2.0.0-alpha.16...v2.0.0-beta.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Bump @babel/preset-env from 7.6.0 to 7.7.1 (mastodon#12318) Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.0 to 7.7.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](babel/babel@v7.6.0...v7.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Bump @babel/runtime from 7.6.0 to 7.7.1 (mastodon#12317) Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.6.0 to 7.7.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.7.1/packages/babel-runtime) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Bump sass-loader from 7.1.0 to 8.0.0 (mastodon#12027) * Bump sass-loader from 7.1.0 to 8.0.0 Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.1.0 to 8.0.0. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/sass-loader@v7.1.0...v8.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * bump webpack * Fix various issues with account migration (mastodon#12301) * Fix being able to follow oneself by moving to an account that was following the old one * Add specs * Add spec to catch MoveWorker issue with local followers following both accounts * Fix move worker breaking when a local account follows both source and target accounts * Fix migration from remote to local account not sending Undo Follow * Fix show_reblogs not being preserved for moved account's followers * Minor improvements to poll composing UI (mastodon#12319) - Disable the “add option” button instead of hiding it - Allow poll option inputs to scale to full width * Fix WebUI allowing to upload more items than the limit (mastodon#12300) Until this patch, drag'n'drop and copy-paste allowed to start uploading as long as the number of *finished* uploads was below the limit. * Fix relationship caches being broken as result of a follow request (mastodon#12299) * Fix type mismatch (mastodon#12324) This was [causing an issue with feed regeneartion in tootctl](hometown-fork#24), and @davefp fixed the issue. * Fix win95 profile page style * Increase profile page max width * Revert "Increase profile page max width" This reverts commit 4b10c37.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes a bunch of issues:
Unfollow
from followers residing on the target account's instance (fixed by switching back to the genericUnfollowFollowWorker
when at least one account is remote, but changed it so that the fact the account is locked is bypassed)show_reblogs
attribute of follow inUnfollowFollowWorker