diff options
author | JantsoP <jantso.porali@gmail.com> | 2017-04-05 10:07:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-05 10:07:17 +0200 |
commit | 20b53e6add351e5bb5ff1bd4d675db6252e03293 (patch) | |
tree | e252e354e63765d1f28919f2ac58de26001806cb /app/controllers/remote_follow_controller.rb | |
parent | 3ec221d3b7093e2a2606ec04036cca9e9f1f733d (diff) | |
parent | ccb6a658fd1a2e596c95d5b8e7a39f72a5f5b14b (diff) |
Merge branch 'master' into master
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 |