tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.
This commit is contained in:
Thibaut Girka
2018-08-24 13:34:51 +02:00
parent 0ddf439999 a2cabf3f4a
commit 246c313d45
52 changed files with 534 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/admin/settings_controller.rb
View File

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

2
app/controllers/admin/suspensions_controller.rb
View File

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