]> cat aescling's git repositories - mastodon.git/commit
Make "unfollow" undo pending outgoing follow request too (#4781)
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 2 Sep 2017 18:44:41 +0000 (20:44 +0200)
committerGitHub <noreply@github.com>
Sat, 2 Sep 2017 18:44:41 +0000 (20:44 +0200)
commitd3b67461735f9a1c38a7eee655a8131bcf6a0cbf
tree3228ad4c8a815867c0ddd6e4f2806686636d2292
parent2a5d1d5a1b2a3c152f2deadac3308f655b6e96be
Make "unfollow" undo pending outgoing follow request too (#4781)

* Make "unfollow" undo pending outgoing follow request too

* Add cancel button to web UI when awaiting follow request approval

* Make the hourglass button do the cancelling
app/javascript/mastodon/containers/account_container.js
app/javascript/mastodon/features/account/components/header.js
app/javascript/mastodon/features/account_timeline/containers/header_container.js
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/lib/activitypub/activity/undo.rb
app/services/process_interaction_service.rb
app/services/unfollow_service.rb