diff options
| author | ThibG <thib@sitedethib.com> | 2019-12-19 16:07:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 16:07:21 +0100 |
| commit | f064cd4fb8057af04f0f1db6a98fc45935811e25 (patch) | |
| tree | 33375e965ba16e3491f3bc3cd733ff2331a48220 /app/views/admin/settings/edit.html.haml | |
| parent | 66ab1f83b0d342341181e0c88da83c966391fc0c (diff) | |
| parent | dace054c0680b3ac6e0da31f3ffa501cd8840fbf (diff) | |
Merge pull request #1255 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/settings/edit.html.haml')
| -rw-r--r-- | app/views/admin/settings/edit.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index ba66aeff8..63b352361 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -38,7 +38,9 @@ %hr.spacer/ .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') + = f.input :enable_bootstrap_timeline_accounts, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_bootstrap_timeline_accounts.title') + .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'), disabled: !Setting.enable_bootstrap_timeline_accounts %hr.spacer/ |