jenkins-bot has submitted this change and it was merged.
Change subject: Simplify $wgApiFrameOptions configuration (2/2)
......................................................................
Simplify $wgApiFrameOptions configuration (2/2)
No need to go through $wmg variable since
b616c2114dc3cc37a323b954e56a68061da1a2ba.
Change-Id: I99f1b4dae922928beaa5c2f5c1149de55d0a354d
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 7 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f5297a6..13e06d9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1985,8 +1985,6 @@
}
}
-$wgApiFrameOptions = $wmgApiFrameOptions;
-
if ( $wmgUseBetaFeatures ) {
wfLoadExtension( 'BetaFeatures' );
}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 0e8fa80..40a53cf 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12388,11 +12388,6 @@
'foundationwiki' => true,
],
-'wmgApiFrameOptions' => [
- 'default' => 'DENY',
- 'enwiki' => 'SAMEORIGIN', // T41877
-],
-
'wgApiFrameOptions' => [
'default' => 'DENY',
'enwiki' => 'SAMEORIGIN', // T41877
--
To view, visit https://gerrit.wikimedia.org/r/287968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99f1b4dae922928beaa5c2f5c1149de55d0a354d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
