Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216421
Change subject: Add json and less highlight support to gitblit and gerrit
......................................................................
Add json and less highlight support to gitblit and gerrit
* Support json and less higlight support in gerrit and gitblit
* html and java highlighting support in gerrit.
Change-Id: I57d96b8207b7b721811cc9883a25037df0b1dff0
---
M manifests/role/designate.pp
M modules/gerrit/templates/gerrit.config.erb
M modules/gitblit/files/gitblit.properties
3 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/216421/1
diff --git a/manifests/role/designate.pp b/manifests/role/designate.pp
index 6720e19..e5ddbef 100644
--- a/manifests/role/designate.pp
+++ b/manifests/role/designate.pp
@@ -82,9 +82,9 @@
# Firewall
- $wikitech = '208.80.154.136'
- $horizon = '208.80.154.147'
- $controller = '208.80.154.18'
+ $wikitech = ipresolve('wikitech.wikimedia.org',4)
+ $horizon = ipresolve('horizon.wikimedia.org',4)
+ $controller = ipresolve(hiera('labs_nova_controller'),4)
# Poke a firewall hole for the designate api
ferm::rule { 'designate-api':
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index c142bdd..3271d84 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -101,6 +101,8 @@
link = https://phabricator.wikimedia.org/T$1
[mimetype "application/javascript"]
safe = true
+[mimetype "application/json"]
+ safe = true
[mimetype "application/x-php"]
safe = true
[mimetype "image/bmp"]
@@ -115,8 +117,16 @@
safe = true
[mimetype "text/css"]
safe = true
+[mimetype "text/html"]
+ safe = true
+[mimetype "text/java"]
+ safe = true
[mimetype "text/javascript"]
safe = true
+[mimetype "text/json"]
+ safe = true
+[mimetype "text/less"]
+ safe = true
[mimetype "text/plain"]
safe = true
[mimetype "text/x-php"]
diff --git a/modules/gitblit/files/gitblit.properties
b/modules/gitblit/files/gitblit.properties
index 080fc5b..0ebdca3 100644
--- a/modules/gitblit/files/gitblit.properties
+++ b/modules/gitblit/files/gitblit.properties
@@ -950,7 +950,7 @@
#
# SPACE-DELIMITED
# SINCE 0.5.0
-web.prettyPrintExtensions = aea agc basic c cbm cl clj cpp cs css dart el erl
erlang frm fs go groovy hs htm html java js latex lisp ll llvm lsp lua ml moxie
mumps n nemerle pascal php pl prefs properties proto py r R rb rd Rd rkt s S
scala scm sh Splus sql ss tcl tex vb vbs vhd vhdl wiki xml xq xquery yaml yml
ymlapollo
+web.prettyPrintExtensions = aea agc basic c cbm cl clj cpp cs css dart el erl
erlang frm fs go groovy hs htm html java js json latex less lisp ll llvm lsp
lua ml moxie mumps n nemerle pascal php pl prefs properties proto py r R rb rd
Rd rkt s S scala scm sh Splus sql ss tcl tex vb vbs vhd vhdl wiki xml xq xquery
yaml yml ymlapollo
# Registered extensions for markdown transformation
#
--
To view, visit https://gerrit.wikimedia.org/r/216421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57d96b8207b7b721811cc9883a25037df0b1dff0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
