Merge 6e970ba6fd into 74fc4dbacf

refactor: Only remove pointer-events when necessary (#35390 )
Disable Metrics/* cops
2025-07-18 02:08:16 +00:00 · 2025-07-15 17:05:56 +00:00 · 2025-07-15 15:57:31 +00:00 · 2025-07-03 18:26:14 -04:00
4 changed files with 13 additions and 25 deletions
--- a/.rubocop/metrics.yml
+++ b/.rubocop/metrics.yml
@ -1,17 +1,21 @@
 ---
 Metrics/AbcSize:
-  Exclude:
-    - lib/mastodon/cli/*.rb
+  Enabled: false

 Metrics/BlockLength:
  Enabled: false

+Metrics/BlockNesting:
+  Enabled: false
+
 Metrics/ClassLength:
  Enabled: false

+Metrics/CollectionLiteralLength:
+  Enabled: false
+
 Metrics/CyclomaticComplexity:
-  Exclude:
-    - lib/mastodon/cli/*.rb
+  Enabled: false

 Metrics/MethodLength:
  Enabled: false
@ -20,4 +24,7 @@ Metrics/ModuleLength:
  Enabled: false

 Metrics/ParameterLists:
-  CountKeywordArgs: false
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@ -10,23 +10,6 @@ Lint/NonLocalExitFromIterator:
  Exclude:
    - 'app/helpers/json_ld_helper.rb'

-# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 82
-
-# Configuration parameters: CountBlocks, CountModifierForms, Max.
-Metrics/BlockNesting:
-  Exclude:
-    - 'lib/tasks/mastodon.rake'
-
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/CyclomaticComplexity:
-  Max: 25
-
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/PerceivedComplexity:
-  Max: 27
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedVars, DefaultToNil.
 Style/FetchEnvVar:
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2848,7 +2848,6 @@ a.account__display-name {
    &__pane {
      height: 100%;
      overflow: hidden;
-      pointer-events: none;
      display: flex;
      justify-content: flex-end;
      min-width: 285px;
@ -2860,7 +2859,6 @@ a.account__display-name {
      &__inner {
        position: fixed;
        width: 285px;
-        pointer-events: auto;
        height: 100%;
      }
    }
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@ -12,7 +12,7 @@ class InitialStateSerializer < ActiveModel::Serializer
  has_one :push_subscription, serializer: REST::WebPushSubscriptionSerializer
  has_one :role, serializer: REST::RoleSerializer

-  def meta # rubocop:disable Metrics/AbcSize
+  def meta
    store = default_meta_store

    if object.current_account
Author	SHA1	Message	Date
Matt Jankowski	fdc81a20ed	Merge `6e970ba6fd` into `74fc4dbacf`	2025-07-15 17:05:56 +00:00
diondiondion	74fc4dbacf	refactor: Only remove pointer-events when necessary (#35390 ) Some checks failed Check i18n / check-i18n (push) Waiting to run Details Chromatic / Run Chromatic (push) Waiting to run Details CodeQL / Analyze (javascript) (push) Waiting to run Details CodeQL / Analyze (ruby) (push) Waiting to run Details Check formatting / lint (push) Waiting to run Details CSS Linting / lint (push) Waiting to run Details Ruby Testing / build (production) (push) Waiting to run Details Ruby Testing / build (test) (push) Waiting to run Details Ruby Testing / test (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / test (3.2) (push) Blocked by required conditions Details Ruby Testing / test (3.3) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (3.2) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (3.3) (push) Blocked by required conditions Details Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions Details Ruby Testing / End to End testing (3.3) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Crowdin / Upload translations / upload-translations (push) Has been cancelled Details Haml Linting / lint (push) Has been cancelled Details Ruby Linting / lint (push) Has been cancelled Details Historical data migration test / test (14-alpine) (push) Has been cancelled Details Historical data migration test / test (15-alpine) (push) Has been cancelled Details Historical data migration test / test (16-alpine) (push) Has been cancelled Details Historical data migration test / test (17-alpine) (push) Has been cancelled Details	2025-07-15 15:57:31 +00:00
Matt Jankowski	6e970ba6fd	Disable `Metrics/*` cops	2025-07-03 18:26:14 -04:00