diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-08-05 04:24:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 04:24:58 +0200 |
| commit | df605f0f8ba795a10cf67095429bfeb7c362b7c9 (patch) | |
| tree | 0d3e613b637800991c7e8bfb170b586bb1a141bb /app/controllers | |
| parent | 029786442a80ad73e1ec7a696a2b7f3dbbfbc10c (diff) | |
Add "signed in as" header to some pages (#4523)
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/authorize_follows_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/remote_follow_controller.rb | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b3c2db02b..0b40fb05b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -43,6 +43,10 @@ class ApplicationController < ActionController::Base forbidden if current_user.account.suspended? end + def after_sign_out_path_for(_resource_or_scope) + new_user_session_path + end + protected def forbidden diff --git a/app/controllers/authorize_follows_controller.rb b/app/controllers/authorize_follows_controller.rb index dccd1c209..78b564183 100644 --- a/app/controllers/authorize_follows_controller.rb +++ b/app/controllers/authorize_follows_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class AuthorizeFollowsController < ApplicationController - layout 'public' + layout 'modal' before_action :authenticate_user! diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb index 2988231b1..48b026aa5 100644 --- a/app/controllers/remote_follow_controller.rb +++ b/app/controllers/remote_follow_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class RemoteFollowController < ApplicationController - layout 'public' + layout 'modal' before_action :set_account before_action :gone, if: :suspended_account? |