diff options
| author | reverite <samantha@chalker.io> | 2019-03-15 05:54:30 -0700 |
|---|---|---|
| committer | reverite <samantha@chalker.io> | 2019-03-15 05:54:30 -0700 |
| commit | 75eeb003b09c53d3b4e98046d1c20b0ad8a887bb (patch) | |
| tree | d2ae669ee583c613a474f8698b7ea718da803819 /app/controllers/admin/settings_controller.rb | |
| parent | 41d1369391d70a9cd25bdf96cfe567975793ef5a (diff) | |
| parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'app/controllers/admin/settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 9624df96b..a64e98868 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -10,7 +10,7 @@ module Admin site_description site_extended_description site_terms - open_registrations + registrations_mode closed_registrations_message open_deletion timeline_preview @@ -33,7 +33,6 @@ module Admin ).freeze BOOLEAN_SETTINGS = %w( - open_registrations open_deletion timeline_preview show_staff_badge |