diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-04-20 18:06:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 18:06:40 +0200 |
| commit | 97da7b73071e9f515c4bb0bca72c88d1a13b14aa (patch) | |
| tree | 89c81064b9e3725962a847e98099a5b84b728733 /app/controllers/admin/dashboard_controller.rb | |
| parent | df326b8b5c0659edb2aca77690a892f228b0e099 (diff) | |
| parent | 4b115d070c9a8b6082ed207bd0a14e809eded322 (diff) | |
Merge pull request #1521 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/dashboard_controller.rb')
| -rw-r--r-- | app/controllers/admin/dashboard_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index 9e921fb95..a00d7ed96 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -36,7 +36,6 @@ module Admin @profile_directory = Setting.profile_directory @timeline_preview = Setting.timeline_preview @keybase_integration = Setting.enable_keybase - @spam_check_enabled = Setting.spam_check_enabled @trends_enabled = Setting.trends end |