jenkins-bot has submitted this change and it was merged.
Change subject: Fix warning in wikibase
......................................................................
Fix warning in wikibase
Change-Id: I5c37717d7929bd6e4451b15da1f5d5dab2db62b9
---
M .idea/codeStyleSettings.xml
M puppet/modules/role/templates/wikidata-init.php.erb
2 files changed, 13 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 40cb851..24ddc32 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -3,6 +3,18 @@
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
+ <option name="OTHER_INDENT_OPTIONS">
+ <value>
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="true" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </value>
+ </option>
<option name="LINE_SEPARATOR" value=" " />
<option name="RIGHT_MARGIN" value="110" />
<XML>
@@ -54,7 +66,6 @@
<option name="FOR_BRACE_FORCE" value="3" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
- <option name="SMART_TABS" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Puppet">
diff --git a/puppet/modules/role/templates/wikidata-init.php.erb
b/puppet/modules/role/templates/wikidata-init.php.erb
index 35b81bc..4b32477 100644
--- a/puppet/modules/role/templates/wikidata-init.php.erb
+++ b/puppet/modules/role/templates/wikidata-init.php.erb
@@ -2,5 +2,6 @@
$wmgUseWikibaseRepo = true;
$wmgUseWikibasePropertySuggester = true;
} else {
+ $wmgUseWikibaseRepo = true;
$wmgUseWikibaseClient = true;
}
--
To view, visit https://gerrit.wikimedia.org/r/172912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c37717d7929bd6e4451b15da1f5d5dab2db62b9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
