Merge c200cb5e09 into 74fc4dbacf

refactor: Only remove pointer-events when necessary (#35390 )
Move active session limit config to x.mastodon area
2025-07-18 10:18:24 +00:00 · 2025-07-15 17:05:56 +00:00 · 2025-07-15 15:57:31 +00:00 · 2025-07-09 07:51:47 -04:00
5 changed files with 5 additions and 11 deletions
--- 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/models/session_activation.rb
+++ b/app/models/session_activation.rb
@ -50,7 +50,7 @@ class SessionActivation < ApplicationRecord
    end

    def purge_old
-      latest.offset(Rails.configuration.x.max_session_activations).destroy_all
+      latest.offset(Rails.configuration.x.mastodon.max_session_activations).destroy_all
    end

    def exclusive(id)
--- a/config/initializers/session_activations.rb
+++ b/config/initializers/session_activations.rb
@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-Rails.application.configure do
-  config.x.max_session_activations = ENV['MAX_SESSION_ACTIVATIONS'] || 10
-end
--- a/config/mastodon.yml
+++ b/config/mastodon.yml
@ -2,6 +2,7 @@
 shared:
  experimental_features: <%= ENV.fetch('EXPERIMENTAL_FEATURES', nil) %>
  limited_federation_mode: <%= (ENV.fetch('LIMITED_FEDERATION_MODE', nil) || ENV.fetch('WHITELIST_MODE', nil)) == 'true' %>
+  max_session_activations: <%= ENV.fetch('MAX_SESSION_ACTIVATIONS', 10) %>
  self_destruct_value: <%= ENV.fetch('SELF_DESTRUCT', nil)&.to_json %>
  software_update_url: <%= ENV.fetch('UPDATE_CHECK_URL', 'https://api.joinmastodon.org/update-check')&.to_json %>
  source:
--- a/spec/models/session_activation_spec.rb
+++ b/spec/models/session_activation_spec.rb
@ -78,10 +78,10 @@ RSpec.describe SessionActivation do

  describe '.purge_old' do
    around do |example|
-      before = Rails.configuration.x.max_session_activations
-      Rails.configuration.x.max_session_activations = 1
+      before = Rails.configuration.x.mastodon.max_session_activations
+      Rails.configuration.x.mastodon.max_session_activations = 1
      example.run
-      Rails.configuration.x.max_session_activations = before
+      Rails.configuration.x.mastodon.max_session_activations = before
    end

    let!(:oldest_session_activation) { Fabricate(:session_activation, created_at: 10.days.ago) }
Author	SHA1	Message	Date
Matt Jankowski	17067e4070	Merge `c200cb5e09` 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	c200cb5e09	Move active session limit config to `x.mastodon` area	2025-07-09 07:51:47 -04:00