diff options
| author | reverite <samantha@chalker.io> | 2019-03-15 05:54:30 -0700 |
|---|---|---|
| committer | reverite <samantha@chalker.io> | 2019-03-15 05:54:30 -0700 |
| commit | 75eeb003b09c53d3b4e98046d1c20b0ad8a887bb (patch) | |
| tree | d2ae669ee583c613a474f8698b7ea718da803819 /app/controllers/api/base_controller.rb | |
| parent | 41d1369391d70a9cd25bdf96cfe567975793ef5a (diff) | |
| parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'app/controllers/api/base_controller.rb')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index a1dd30918..3a92ee4e4 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -73,7 +73,9 @@ class Api::BaseController < ApplicationController elsif current_user.disabled? render json: { error: 'Your login is currently disabled' }, status: 403 elsif !current_user.confirmed? - render json: { error: 'Email confirmation is not completed' }, status: 403 + render json: { error: 'Your login is missing a confirmed e-mail address' }, status: 403 + elsif !current_user.approved? + render json: { error: 'Your login is currently pending approval' }, status: 403 else set_user_activity end |