diff options
author | David Yip <yipdw@member.fsf.org> | 2017-12-30 17:20:07 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-12-30 17:20:07 -0600 |
commit | 4cca1d1e7efce51eecb64489f412a7b8631f0aed (patch) | |
tree | 5259571423a25c9a478052599c5e3d04db7fc8bd /app/views/admin/settings | |
parent | e4944d065b6bd6c6718c27700971be832ed4861a (diff) | |
parent | f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/auth/confirmations_controller.rb
Diffstat (limited to 'app/views/admin/settings')
-rw-r--r-- | app/views/admin/settings/edit.html.haml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index c7c25f528..4f9115ed2 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -46,5 +46,13 @@ .fields-group = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label, label: t('admin.settings.bootstrap_timeline_accounts.title'), hint: t('admin.settings.bootstrap_timeline_accounts.desc_html') + %hr/ + + .fields-group + = f.input :activity_api_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.activity_api_enabled.title'), hint: t('admin.settings.activity_api_enabled.desc_html') + + .fields-group + = f.input :peers_api_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.peers_api_enabled.title'), hint: t('admin.settings.peers_api_enabled.desc_html') + .actions = f.button :button, t('generic.save_changes'), type: :submit |