Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Allow mods to disable login, improve message when login disabled (#8329)

Browse source 
* 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
This commit is contained in:
Eugen Rochko 2018-08-23 23:26:29 +02:00 • committed by GitHub
parent 9d58daac6c
commit 2f34b747b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/base_controller.rb
View file

@ -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|