diff options
| author | André Lewin <andre.charles.lewin@gmail.com> | 2017-04-05 20:28:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 20:28:58 +0200 |
| commit | bf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (patch) | |
| tree | 45bc6b379f5d06553d0a3e5bf4c0e2b452b7552f /app/controllers/remote_follow_controller.rb | |
| parent | 8736ef50ad13d5506bd6a673d4fcb96c33b609a3 (diff) | |
| parent | d13d169922c7efeb6e6c20ef6a271eeda552275f (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 |