diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-23 10:15:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-23 10:15:13 +0100 |
| commit | 867790e07a149b1213936c3ff1fc5815d37e2e94 (patch) | |
| tree | d165b5ba19e907a8e57b1abf5ab5cf408419e051 /config | |
| parent | 02ac94490a67659c7cc669ead5b107b724db6e68 (diff) | |
| parent | b4f60bc6de4ece3b2ff908d31a0c34ddbbfacf2c (diff) | |
Merge pull request #2144 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/production.rb | 1 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 108927060..95c6e790f 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -127,7 +127,6 @@ Rails.application.configure do 'X-Frame-Options' => 'DENY', 'X-Content-Type-Options' => 'nosniff', 'X-XSS-Protection' => '0', - 'Permissions-Policy' => 'interest-cohort=()', 'X-Clacks-Overhead' => 'GNU Natalie Nguyen', 'Referrer-Policy' => 'same-origin', } diff --git a/config/locales/en.yml b/config/locales/en.yml index 592450100..fa7fb6be0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1697,7 +1697,7 @@ en: seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available. signed_in_as: 'Signed in as:' verification: - explanation_html: 'You can <strong>verify yourself as the owner of the links in your profile metadata</strong>. For that, the linked website must contain a link back to your Mastodon profile. The link back <strong>must</strong> have a <code>rel="me"</code> attribute. The text content of the link does not matter. Here is an example:' + explanation_html: 'You can <strong>verify yourself as the owner of the links in your profile metadata</strong>. For that, the linked website must contain a link back to your Mastodon profile. After adding the link you may need to come back here and re-save your profile for the verification to take effect. The link back <strong>must</strong> have a <code>rel="me"</code> attribute. The text content of the link does not matter. Here is an example:' verification: Verification webauthn_credentials: add: Add new security key diff --git a/config/routes.rb b/config/routes.rb index 257babbf6..099933116 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -233,7 +233,7 @@ Rails.application.routes.draw do get '/dashboard', to: 'dashboard#index' resources :domain_allows, only: [:new, :create, :show, :destroy] - resources :domain_blocks, only: [:new, :create, :show, :destroy, :update, :edit] do + resources :domain_blocks, only: [:new, :create, :destroy, :update, :edit] do collection do post :batch end |