Solve simplest haml-lint Rubocop lints (#27529)
				
					
				
			This commit is contained in:
		
							parent
							
								
									fa65c8244f
								
							
						
					
					
						commit
						70dbf84b9b
					
				@ -1,6 +1,6 @@
 | 
				
			|||||||
# This configuration was generated by
 | 
					# This configuration was generated by
 | 
				
			||||||
# `haml-lint --auto-gen-config`
 | 
					# `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
 | 
					# The point is for the user to remove these configuration records
 | 
				
			||||||
# one by one as the lints are removed from the code base.
 | 
					# one by one as the lints are removed from the code base.
 | 
				
			||||||
# Note that changes in the inspected code, or installation of new
 | 
					# Note that changes in the inspected code, or installation of new
 | 
				
			||||||
@ -11,41 +11,11 @@ linters:
 | 
				
			|||||||
  LineLength:
 | 
					  LineLength:
 | 
				
			||||||
    enabled: false
 | 
					    enabled: false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Offense count: 45
 | 
					  # Offense count: 10
 | 
				
			||||||
  RuboCop:
 | 
					  RuboCop:
 | 
				
			||||||
    exclude:
 | 
					    exclude:
 | 
				
			||||||
      - 'app/views/admin/accounts/_account.html.haml'
 | 
					 | 
				
			||||||
      - 'app/views/admin/accounts/_buttons.html.haml'
 | 
					      - 'app/views/admin/accounts/_buttons.html.haml'
 | 
				
			||||||
      - 'app/views/admin/accounts/_local_account.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/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/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/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
									
								
							
							
						
						
									
										5
									
								
								app/views/.rubocop.yml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,5 @@
 | 
				
			|||||||
 | 
					inherit_from: ../../.rubocop.yml
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Disable for the `Rubocop` lints in haml-lint
 | 
				
			||||||
 | 
					Style/IfUnlessModifier:
 | 
				
			||||||
 | 
					  Enabled: false
 | 
				
			||||||
@ -30,6 +30,6 @@
 | 
				
			|||||||
                \-
 | 
					                \-
 | 
				
			||||||
              %br/
 | 
					              %br/
 | 
				
			||||||
              %samp.ellipsized-ip= relevant_account_ip(account, params[:ip])
 | 
					              %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
 | 
					      .batch-table__row__content__quote
 | 
				
			||||||
        %p= account.user&.invite_request&.text
 | 
					        %p= account.user&.invite_request&.text
 | 
				
			||||||
 | 
				
			|||||||
@ -73,7 +73,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  %hr.spacer/
 | 
					  %hr.spacer/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  - if @account.user&.invite_request&.text&.present?
 | 
					  - if @account.user&.invite_request&.text.present?
 | 
				
			||||||
    .speech-bubble
 | 
					    .speech-bubble
 | 
				
			||||||
      .speech-bubble__bubble
 | 
					      .speech-bubble__bubble
 | 
				
			||||||
        = @account.user&.invite_request&.text
 | 
					        = @account.user&.invite_request&.text
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,6 @@
 | 
				
			|||||||
  = t('.title', domain: Addressable::IDNA.to_unicode(@domain_block.domain))
 | 
					  = t('.title', domain: Addressable::IDNA.to_unicode(@domain_block.domain))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
= simple_form_for @domain_block, url: admin_domain_blocks_path, method: :post do |f|
 | 
					= 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))
 | 
					  %p.hint= t('.preamble_html', domain: Addressable::IDNA.to_unicode(@domain_block.domain))
 | 
				
			||||||
  %ul.hint
 | 
					  %ul.hint
 | 
				
			||||||
    %li= t('.stop_communication')
 | 
					    %li= t('.stop_communication')
 | 
				
			||||||
 | 
				
			|||||||
@ -23,7 +23,7 @@
 | 
				
			|||||||
            %td= update.version
 | 
					            %td= update.version
 | 
				
			||||||
            %td= t("admin.software_updates.types.#{update.type}")
 | 
					            %td= t("admin.software_updates.types.#{update.type}")
 | 
				
			||||||
            - if update.urgent?
 | 
					            - if update.urgent?
 | 
				
			||||||
              %td.critical= t("admin.software_updates.critical_update")
 | 
					              %td.critical= t('admin.software_updates.critical_update')
 | 
				
			||||||
            - else
 | 
					            - else
 | 
				
			||||||
              %td
 | 
					              %td
 | 
				
			||||||
            %td= table_link_to 'link', t('admin.software_updates.release_notes'), update.release_notes
 | 
					            %td= table_link_to 'link', t('admin.software_updates.release_notes'), update.release_notes
 | 
				
			||||||
 | 
				
			|||||||
@ -35,7 +35,6 @@
 | 
				
			|||||||
          %span= t('admin.trends.tags.not_trendable')
 | 
					          %span= t('admin.trends.tags.not_trendable')
 | 
				
			||||||
          = fa_icon 'lock fw'
 | 
					          = fa_icon 'lock fw'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
      = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.listable? ? 'positive' : 'negative'] do
 | 
					      = link_to admin_tag_path(@tag.id), class: ['dashboard__quick-access', @tag.listable? ? 'positive' : 'negative'] do
 | 
				
			||||||
        - if @tag.listable?
 | 
					        - if @tag.listable?
 | 
				
			||||||
          %span= t('admin.trends.tags.listable')
 | 
					          %span= t('admin.trends.tags.listable')
 | 
				
			||||||
 | 
				
			|||||||
@ -10,7 +10,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
      %br/
 | 
					      %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 })
 | 
					        = 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))
 | 
					      - if tag.trendable? && (rank = Trends.tags.rank(tag.id))
 | 
				
			||||||
 | 
				
			|||||||
@ -33,7 +33,6 @@
 | 
				
			|||||||
      = f.simple_fields_for :invite_request, resource.invite_request || resource.build_invite_request do |invite_request_fields|
 | 
					      = 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
 | 
					        = 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]
 | 
					  = hidden_field_tag :accept, params[:accept]
 | 
				
			||||||
  = f.input :invite_code, as: :hidden
 | 
					  = f.input :invite_code, as: :hidden
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
!!!
 | 
					!!!
 | 
				
			||||||
%html{ lang: I18n.locale }
 | 
					%html{ lang: I18n.locale }
 | 
				
			||||||
  %head
 | 
					  %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' }/
 | 
					    %meta{ charset: 'utf-8' }/
 | 
				
			||||||
    %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
 | 
					    %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
 | 
				
			||||||
    %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
 | 
					    %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,6 @@
 | 
				
			|||||||
  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_policy'
 | 
					  = 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|
 | 
					= simple_form_for @policy, url: statuses_cleanup_path, method: :put, html: { id: 'edit_policy' } do |f|
 | 
				
			||||||
 | 
					 | 
				
			||||||
  .fields-row
 | 
					  .fields-row
 | 
				
			||||||
    .fields-row__column.fields-row__column-6.fields-group
 | 
					    .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')
 | 
					      = f.input :enabled, as: :boolean, wrapper: :with_label, label: t('statuses_cleanup.enabled'), hint: t('statuses_cleanup.enabled_hint')
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user