diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 19:31:32 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 21:49:35 +0200 |
| commit | 1488be7d9683fb3442c6f7bd4fd911d224f0c929 (patch) | |
| tree | 42548a596bb118e08c14c4d0ae9eacb3e8b2f36b /app/views/settings | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
| parent | d22f3a7d5140ef1c3ae6e9bd2241bbb5289af8d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/featured_tags/index.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml index 5f69517f3..6734d027c 100644 --- a/app/views/settings/featured_tags/index.html.haml +++ b/app/views/settings/featured_tags/index.html.haml @@ -1,6 +1,10 @@ - content_for :page_title do = t('settings.featured_tags') +%p= t('featured_tags.hint_html') + +%hr.spacer/ + = simple_form_for @featured_tag, url: settings_featured_tags_path do |f| = render 'shared/error_messages', object: @featured_tag |