diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-30 18:24:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 18:24:38 -0600 |
| commit | d817c0a958efda990af654f72d15d6f42b43dd49 (patch) | |
| tree | 0cff3632163fadeba3585f56ecdd8d1d919e12c7 /app/controllers/admin/settings_controller.rb | |
| parent | 65c87ca0ae20eb5dc62751047bda3e8b11e37ce0 (diff) | |
| parent | 4cca1d1e7efce51eecb64489f412a7b8631f0aed (diff) | |
Merge pull request #291 from glitch-soc/merge-upstream
Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
Diffstat (limited to 'app/controllers/admin/settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index eed5fb6b5..487282dc3 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -17,6 +17,8 @@ module Admin bootstrap_timeline_accounts thumbnail min_invite_role + activity_api_enabled + peers_api_enabled ).freeze BOOLEAN_SETTINGS = %w( @@ -24,6 +26,8 @@ module Admin open_deletion timeline_preview show_staff_badge + activity_api_enabled + peers_api_enabled ).freeze UPLOAD_SETTINGS = %w( |