Merge pull request #63 from noellabo/merge-master-20180716

Merge master 20180716-02
dtp-mstdn-jp · Jul 16, 2018 · 46a8971 · 46a8971
2 parents 28efb99 + 9062b4c
commit 46a8971
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
@@ -11,7 +11,7 @@ def index
       @relay_enabled         = Relay.enabled.exists?
       @single_user_mode      = Rails.configuration.x.single_user_mode
       @registrations_enabled = Setting.open_registrations
-      @deletions_enabled     = Setting.open_deletions
+      @deletions_enabled     = Setting.open_deletion
       @invites_enabled       = Setting.min_invite_role == 'user'
       @search_enabled        = Chewy.enabled?
       @version               = Mastodon::Version.to_s