diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:14:05 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:17:20 +0100 |
| commit | 07eb31eeacc4e0364b839233a41fa65eb3c650ce (patch) | |
| tree | 843cda5a4d9bc730aba9a13d0634fef5e2212515 /app/controllers/admin/settings_controller.rb | |
| parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
| parent | 874bd3ac0c56e2d2901785e170b27f5cde32b33b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
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 |