Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb`
This commit is contained in:
commit
f09f5b35f2
47 files changed
+622
-476
No files matched your search
@@ -25,6 +25,8 @@ class Admin::DomainAllowsController < Admin::BaseController
|
||||
def destroy
|
||||
authorize @domain_allow, :destroy?
|
||||
UnallowDomainService.new.call(@domain_allow)
|
||||
log_action :destroy, @domain_allow
|
||||
|
||||
redirect_to admin_instances_path, notice: I18n.t('admin.domain_allows.destroyed_msg')
|
||||
end
|
||||
|
||||
|
||||
Reference in new issue
Block a user