diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-23 23:26:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-23 23:26:29 +0200 |
| commit | 2f34b747b3f765a37d7b23e70de42005c0b62f58 (patch) | |
| tree | 4fbfe29446c9ebdfe8a072ba07a71218613eb32f /app/controllers/api/base_controller.rb | |
| parent | 9d58daac6c860b599f8c266b8bb10c6170220dd3 (diff) | |
Allow mods to disable login, improve message when login disabled (#8329)
* Allow moderators to disable/enable login * Instead of rejecting login, show forbidden error when login disabled Avoid confusion because when login is rejected, the message is that the account is not activated, which is wrong. * Fix tests
Diffstat (limited to 'app/controllers/api/base_controller.rb')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 770a69921..0b3735087 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -7,6 +7,8 @@ class Api::BaseController < ApplicationController include RateLimitHeaders skip_before_action :store_current_location + skip_before_action :check_user_permissions + protect_from_forgery with: :null_session rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e| |