jenkins-bot has submitted this change and it was merged.

Change subject: Simplify $wgApiFrameOptions configuration (1/2)
......................................................................


Simplify $wgApiFrameOptions configuration (1/2)

No need to go through $wmg variable since 
b616c2114dc3cc37a323b954e56a68061da1a2ba.

Change-Id: I4f3e2a644e7ca4f8b25df598ae66ddb11a95dfa9
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Thcipriani: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index e16d04a..0e8fa80 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12388,12 +12388,16 @@
        'foundationwiki' => true,
 ],
 
-
 'wmgApiFrameOptions' => [
        'default' => 'DENY',
        'enwiki' => 'SAMEORIGIN', // T41877
 ],
 
+'wgApiFrameOptions' => [
+       'default' => 'DENY',
+       'enwiki' => 'SAMEORIGIN', // T41877
+],
+
 'wmgAltUploadForm' => [ // T35513
        'default' => 'Special:Upload',
        'test2wiki' => 'Wikipedia:Upload',

-- 
To view, visit https://gerrit.wikimedia.org/r/287939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f3e2a644e7ca4f8b25df598ae66ddb11a95dfa9
Gerrit-PatchSet: 2
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

Reply via email to