diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-05 03:27:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-05 03:27:38 +0200 |
commit | 4c92f156645f62bd6170df1ce966374574e44ef1 (patch) | |
tree | 8ba55a55df75046b4f0a06151418453d06672f13 /app/controllers/remote_follow_controller.rb | |
parent | 5af0ecbcd9cfd757c4d5bd541d83ca11e44d14ef (diff) | |
parent | 94d00f278819d34ef97d59d17eb289e9be217dfe (diff) |
Merge branch 'master' into add_more_tests_to_models
Diffstat (limited to 'app/controllers/remote_follow_controller.rb')
-rw-r--r-- | app/controllers/remote_follow_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb index 7d4bfe6ce..1e3f786ec 100644 --- a/app/controllers/remote_follow_controller.rb +++ b/app/controllers/remote_follow_controller.rb @@ -8,6 +8,7 @@ class RemoteFollowController < ApplicationController def new @remote_follow = RemoteFollow.new + @remote_follow.acct = session[:remote_follow] if session.key?(:remote_follow) end def create @@ -22,6 +23,8 @@ class RemoteFollowController < ApplicationController render(:new) && return end + session[:remote_follow] = @remote_follow.acct + redirect_to Addressable::Template.new(redirect_url_link.template).expand(uri: "#{@account.username}@#{Rails.configuration.x.local_domain}").to_s else render :new |