diff options
| author | Valentin Ouvrard <valentin210594@gmail.com> | 2017-04-08 13:39:09 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 13:39:09 +1100 |
| commit | 3e4eb9c95fc8d8f3fff1db90215d5050214adc59 (patch) | |
| tree | c9f709f2582f8fe97c72b4faa8bc0811bbbb4deb /app/controllers/remote_follow_controller.rb | |
| parent | 93e53a3311c33b218d1cf7ae26b74056dfabc909 (diff) | |
| parent | fc7b8307190b8f472b526d99bc10db58153850d5 (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 |