Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

19835be0

Commit 19835be0 authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'

Fix remote follow from /ostatus_subscribe

Closes #1103

See merge request pleroma/pleroma!1472

parents 931c4974 8d9f43e1

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/twitter_api/controllers/util_controller.ex 1 addition, 2 deletions

lib/pleroma/web/twitter_api/controllers/util_controller.ex
lib/pleroma/web/web_finger/web_finger.ex 10 additions, 4 deletions

lib/pleroma/web/web_finger/web_finger.ex
test/fixtures/tesla_mock/kpherox@mstdn.jp.xml 10 additions, 0 deletions

test/fixtures/tesla_mock/kpherox@mstdn.jp.xml
test/support/http_request_mock.ex 8 additions, 0 deletions

test/support/http_request_mock.ex
test/web/web_finger/web_finger_test.exs 14 additions, 0 deletions

test/web/web_finger/web_finger_test.exs

with 43 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment