Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 16:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes applied to `app/javascript/core/admin.js` instead.
This commit is contained in:
Claire
2024-02-24 15:35:56 +01:00
parent 7901dc9e24 9d8dfeb5fb
commit 1ad91dece8
8 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/core/admin.js
View File

@@ -144,6 +144,10 @@ Rails.delegate(document, '#form_admin_settings_enable_bootstrap_timeline_account
const onChangeRegistrationMode = (target) => {
const enabled = target.value === 'approved';
[].forEach.call(document.querySelectorAll('.form_admin_settings_registrations_mode .warning-hint'), (warning_hint) => {
warning_hint.style.display = target.value === 'open' ? 'inline' : 'none';
});
[].forEach.call(document.querySelectorAll('#form_admin_settings_require_invite_text'), (input) => {
input.disabled = !enabled;
if (enabled) {