diff options
author | James Moger <james.moger@gitblit.com> | 2014-09-05 15:04:31 -0400 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2014-09-05 15:04:31 -0400 |
commit | 668a0d65fe393986c662a62f667204872582d93f (patch) | |
tree | 3d0560bde9d7f910df71bd4861c43f49be0b60f2 | |
parent | 884fd0d19330ecd8fa292d0bbfae3808bc34b97e (diff) | |
parent | f9ce9fa1be1a0dc901f4251e75f7bb49ebc0ab86 (diff) | |
download | gitblit-668a0d65fe393986c662a62f667204872582d93f.tar.gz gitblit-668a0d65fe393986c662a62f667204872582d93f.zip |
Merge branch 'ticket/165' into develop
-rw-r--r-- | src/main/java/com/gitblit/wicket/pages/TicketPage.html | 2 | ||||
-rw-r--r-- | src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html index aa52d8fa..36dca4c4 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketPage.html +++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.html @@ -596,7 +596,7 @@ pt push</pre> quality="high"
wmode="transparent"
scale="noscale"
- allowScriptAccess="always"></object>
+ allowScriptAccess="sameDomain"></object>
</wicket:fragment>
</wicket:extend>
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html index 4b28e71c..a537277f 100644 --- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html +++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html @@ -95,7 +95,7 @@ quality="high"
wmode="transparent"
scale="noscale"
- allowScriptAccess="always"></object>
+ allowScriptAccess="sameDomain"></object>
</wicket:fragment>
<wicket:fragment wicket:id="workingCopyFragment">
|