mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Solve simplest haml-lint Rubocop lints (#27529)

Browse Source
This commit is contained in:
Matt Jankowski 2023-10-25 08:38:01 -04:00 committed by GitHub
parent fa65c8244f
commit 70dbf84b9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 12 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.haml-lint_todo.yml
View File

@ -1,6 +1,6 @@
# This configuration was generated by
# `haml-lint --auto-gen-config`
# on 2023-10-24 14:08:37 -0400 using Haml-Lint version 0.51.0.
# on 2023-10-25 08:29:48 -0400 using Haml-Lint version 0.51.0.
# The point is for the user to remove these configuration records
# one by one as the lints are removed from the code base.
# Note that changes in the inspected code, or installation of new
@ -11,41 +11,11 @@ linters:
LineLength:
enabled: false
# Offense count: 45
# Offense count: 10
RuboCop:
exclude:
- 'app/views/admin/accounts/_account.html.haml'
- 'app/views/admin/accounts/_buttons.html.haml'
- 'app/views/admin/accounts/_local_account.html.haml'
- 'app/views/admin/accounts/_remote_account.html.haml'
- 'app/views/admin/accounts/index.html.haml'
- 'app/views/admin/accounts/show.html.haml'
- 'app/views/admin/custom_emojis/index.html.haml'
- 'app/views/admin/dashboard/index.html.haml'
- 'app/views/admin/domain_blocks/confirm_suspension.html.haml'
- 'app/views/admin/follow_recommendations/show.html.haml'
- 'app/views/admin/invites/_invite.html.haml'
- 'app/views/admin/invites/index.html.haml'
- 'app/views/admin/ip_blocks/index.html.haml'
- 'app/views/admin/reports/_status.html.haml'
- 'app/views/admin/reports/show.html.haml'
- 'app/views/admin/roles/_form.html.haml'
- 'app/views/admin/software_updates/index.html.haml'
- 'app/views/admin/status_edits/_status_edit.html.haml'
- 'app/views/admin/statuses/index.html.haml'
- 'app/views/admin/tags/show.html.haml'
- 'app/views/admin/trends/tags/_tag.html.haml'
- 'app/views/auth/registrations/_session.html.haml'
- 'app/views/auth/registrations/new.html.haml'
- 'app/views/auth/sessions/two_factor.html.haml'
- 'app/views/auth/shared/_progress.html.haml'
- 'app/views/disputes/strikes/_card.html.haml'
- 'app/views/filters/statuses/index.html.haml'
- 'app/views/invites/_invite.html.haml'
- 'app/views/layouts/application.html.haml'
- 'app/views/layouts/error.html.haml'
- 'app/views/statuses/_detailed_status.html.haml'
- 'app/views/statuses/_og_image.html.haml'
- 'app/views/statuses/_simple_status.html.haml'
- 'app/views/statuses_cleanup/show.html.haml'
- 'app/views/user_mailer/warning.html.haml'

5
app/views/.rubocop.yml Normal file
View File

@ -0,0 +1,5 @@
inherit_from: ../../.rubocop.yml
# Disable for the `Rubocop` lints in haml-lint
Style/IfUnlessModifier:
Enabled: false

2
app/views/admin/accounts/_account.html.haml
View File

@ -30,6 +30,6 @@
\-
%br/
%samp.ellipsized-ip= relevant_account_ip(account, params[:ip])
- if !account.suspended? && account.user_pending? && account.user&.invite_request&.text&.present?
- if !account.suspended? && account.user_pending? && account.user&.invite_request&.text.present?
.batch-table__row__content__quote
%p= account.user&.invite_request&.text

2
app/views/admin/accounts/show.html.haml
View File

@ -73,7 +73,7 @@
%hr.spacer/
- if @account.user&.invite_request&.text&.present?
- if @account.user&.invite_request&.text.present?
.speech-bubble
.speech-bubble__bubble
= @account.user&.invite_request&.text

1
app/views/admin/domain_blocks/confirm_suspension.html.haml
View File

@ -2,7 +2,6 @@
= t('.title', domain: Addressable::IDNA.to_unicode(@domain_block.domain))
= simple_form_for @domain_block, url: admin_domain_blocks_path, method: :post do |f|
%p.hint= t('.preamble_html', domain: Addressable::IDNA.to_unicode(@domain_block.domain))
%ul.hint
%li= t('.stop_communication')

2
app/views/admin/software_updates/index.html.haml
View File

@ -23,7 +23,7 @@
%td= update.version
%td= t("admin.software_updates.types.#{update.type}")
- if update.urgent?
%td.critical= t("admin.software_updates.critical_update")
%td.critical= t('admin.software_updates.critical_update')
- else
%td
%td= table_link_to 'link', t('admin.software_updates.release_notes'), update.release_notes

1
app/views/admin/tags/show.html.haml
View File

@ -35,7 +35,6 @@
%span= t('admin.trends.tags.not_trendable')
= fa_icon 'lock fw'
= link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.listable? ? 'positive' : 'negative'] do
- if @tag.listable?
%span= t('admin.trends.tags.listable')

2
app/views/admin/trends/tags/_tag.html.haml
View File

@ -10,7 +10,7 @@
%br/
= link_to tag_path(tag), target: '_blank' do
= link_to tag_path(tag), target: '_blank', rel: 'noopener noreferrer' do
= t('admin.trends.tags.used_by_over_week', count: tag.history.reduce(0) { |sum, day| sum + day.accounts })
- if tag.trendable? && (rank = Trends.tags.rank(tag.id))

1
app/views/auth/registrations/new.html.haml
View File

@ -33,7 +33,6 @@
= f.simple_fields_for :invite_request, resource.invite_request || resource.build_invite_request do |invite_request_fields|
= invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: Setting.require_invite_text, label: false, hint: false
= hidden_field_tag :accept, params[:accept]
= f.input :invite_code, as: :hidden

2
app/views/layouts/error.html.haml
View File

@ -1,7 +1,7 @@
!!!
%html{ lang: I18n.locale }
%head
%meta{ content: 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/
%meta{ 'content' => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/
%meta{ charset: 'utf-8' }/
%title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
%meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/

1
app/views/statuses_cleanup/show.html.haml
View File

@ -5,7 +5,6 @@
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_policy'
= simple_form_for @policy, url: statuses_cleanup_path, method: :put, html: { id: 'edit_policy' } do |f|
.fields-row
.fields-row__column.fields-row__column-6.fields-group
= f.input :enabled, as: :boolean, wrapper: :with_label, label: t('statuses_cleanup.enabled'), hint: t('statuses_cleanup.enabled_hint')