diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-18 18:04:49 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-18 18:04:49 +0200 |
| commit | bfeac6747a58b660f0d1b3766c7cfb3ea2655fce (patch) | |
| tree | e9d1366c30b94df21ec767276fbde175428399fb /app/views/well_known/webfinger | |
| parent | 7423c0c1308555db3072ae64141250fdd33ce235 (diff) | |
| parent | 298ee84488758fc08a0ae9233e04c9637aa2fe02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.
Diffstat (limited to 'app/views/well_known/webfinger')
| -rw-r--r-- | app/views/well_known/webfinger/show.xml.ruby | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/well_known/webfinger/show.xml.ruby b/app/views/well_known/webfinger/show.xml.ruby index 4352a24e9..968c8c138 100644 --- a/app/views/well_known/webfinger/show.xml.ruby +++ b/app/views/well_known/webfinger/show.xml.ruby @@ -37,7 +37,7 @@ doc << Ox::Element.new('XRD').tap do |xrd| xrd << Ox::Element.new('Link').tap do |link| link['rel'] = 'http://ostatus.org/schema/1.0/subscribe' - link['template'] = "#{authorize_follow_url}?acct={uri}" + link['template'] = "#{authorize_interaction_url}?acct={uri}" end end |