diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-19 02:17:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-19 02:17:02 +0100 |
| commit | 79c57810b7fea1962c9746d74c90235ad4e3e899 (patch) | |
| tree | 6ec332dd20fa4ce8de954d8e260cce3f2dc67aee /app/views/admin/settings/edit.html.haml | |
| parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
| parent | 5c966bef8b6aa116cfa2102e83e42d0fe421f3fc (diff) | |
Merge pull request #1477 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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index 9281d820e..fa8d8441e 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -47,7 +47,8 @@ %hr.spacer/ .fields-group - = f.input :enable_bootstrap_timeline_accounts, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_bootstrap_timeline_accounts.title') + = f.input :enable_bootstrap_timeline_accounts, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_bootstrap_timeline_accounts.title'), hint: t('admin.settings.enable_bootstrap_timeline_accounts.desc_html') + .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 |