summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Czech <maczech@gmail.com>2020-06-16 07:47:16 +0000
committerMarcin Czech <maczech@gmail.com>2020-06-16 07:52:06 +0000
commit56918394544b6207a626cb0938d0bba4927a9fa4 (patch)
tree014202018a0dd33cdec70736c4ac745045e33476
parent2519229e059c3302ed3fff1f2967a57f2bf3f677 (diff)
Revert "Remove documentation of obsolete gerrit.canLoadInIFrame"
This reverts commit 21d22133a1232cd71bb8fc8dcb6f806f62afee68. Reason for revert: gerrit.canLoadInIFrame is needed for Issue 12926 Change-Id: Ie7332415751496ab0f1f9b6d7ca72c05bb881903
-rw-r--r--Documentation/config-gerrit.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 68b16154ad..531bb94f7c 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -2079,6 +2079,13 @@ file containing the class must be placed in the `$site_path/lib` folder.
+
If not specified, the default no-op implementation is used.
+[[gerrit.canLoadInIFrame]]gerrit.canLoadInIFrame::
++
+For security reasons Gerrit will always jump out of iframe.
+Setting this option to true will prevent this behavior.
++
+By default false.
+
[[gerrit.cdnPath]]gerrit.cdnPath::
+
Path prefix for PolyGerrit's static resources if using a CDN.