diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-12-27 21:35:47 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-12-27 21:35:47 +0000 |
| commit | 797a8429a0deb511e6d6092edad39f856231534e (patch) | |
| tree | 6e44d3c2a5a662dfc4e4087fdc391b8e7bb41dba /app/models/form | |
| parent | 94894b8a6ad1247306497dc8c0c47d52a8a2f72c (diff) | |
| parent | f349fe2159fb36e598263f2797f041417ef7c2da (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/models/form')
| -rw-r--r-- | app/models/form/admin_settings.rb | 2 | ||||
| -rw-r--r-- | app/models/form/admin_suspension_confirmation.rb | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 34c75e3bf..d568200ed 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -30,6 +30,8 @@ class Form::AdminSettings :show_staff_badge=, :bootstrap_timeline_accounts, :bootstrap_timeline_accounts=, + :hide_followers_count, + :hide_followers_count=, :flavour, :flavour=, :skin, diff --git a/app/models/form/admin_suspension_confirmation.rb b/app/models/form/admin_suspension_confirmation.rb deleted file mode 100644 index c34b5b30e..000000000 --- a/app/models/form/admin_suspension_confirmation.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -class Form::AdminSuspensionConfirmation - include ActiveModel::Model - - attr_accessor :acct, :report_id -end |