diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 13:34:51 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 15:10:34 +0200 |
| commit | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (patch) | |
| tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/controllers/admin | |
| parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
| parent | a2cabf3f4af9271d8bfdb13c1ae2b7a8b4e6fb88 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/admin/suspensions_controller.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 3234b194f..c05c4c841 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -16,6 +16,8 @@ module Admin timeline_preview show_staff_badge bootstrap_timeline_accounts + flavour + skin thumbnail hero min_invite_role @@ -23,6 +25,7 @@ module Admin peers_api_enabled show_known_fediverse_at_about_page preview_sensitive_media + custom_css ).freeze BOOLEAN_SETTINGS = %w( diff --git a/app/controllers/admin/suspensions_controller.rb b/app/controllers/admin/suspensions_controller.rb index 0c7bdad9e..f9bbf36fb 100644 --- a/app/controllers/admin/suspensions_controller.rb +++ b/app/controllers/admin/suspensions_controller.rb @@ -14,7 +14,7 @@ module Admin @suspension = Form::AdminSuspensionConfirmation.new(suspension_params) if suspension_params[:acct] == @account.acct - resolve_report! if suspension_params[:report_id] + resolve_report! if suspension_params[:report_id].present? perform_suspend! mark_reports_resolved! redirect_to admin_accounts_path |