diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-10-27 12:14:01 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-10-27 12:14:01 +0100 |
commit | 41a98b654372532c389e720a0ecd08b9a9884b6d (patch) | |
tree | aff32a956d3d12d67b94e3193cd3a8d6b8446b9b /app/views/admin/tags | |
parent | 18c07738a6b0fa3558863dbb1610695ab6f11b74 (diff) | |
parent | 4988ebba4e31aff5dee657836cf059b5843d9eb8 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb
Diffstat (limited to 'app/views/admin/tags')
-rw-r--r-- | app/views/admin/tags/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/tags/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/tags/index.html.haml b/app/views/admin/tags/index.html.haml index 4ab52a165..298ac59e9 100644 --- a/app/views/admin/tags/index.html.haml +++ b/app/views/admin/tags/index.html.haml @@ -45,7 +45,7 @@ - Admin::FilterHelper::TAGS_FILTERS.each do |key| = hidden_field_tag key, params[key] if params[key].present? - .batch-table + .batch-table.optional .batch-table__toolbar %label.batch-table__toolbar__select.batch-checkbox-all = check_box_tag :batch_checkbox_all, nil, false diff --git a/app/views/admin/tags/show.html.haml b/app/views/admin/tags/show.html.haml index 5799e5973..c9a147587 100644 --- a/app/views/admin/tags/show.html.haml +++ b/app/views/admin/tags/show.html.haml @@ -3,7 +3,7 @@ .dashboard__counters %div - = link_to tag_url(@tag), target: '_blank', rel: 'noopener' do + = link_to tag_url(@tag), target: '_blank', rel: 'noopener noreferrer' do .dashboard__counters__num= number_with_delimiter @accounts_today .dashboard__counters__label= t 'admin.tags.accounts_today' %div |