jenkins-bot has submitted this change and it was merged.
Change subject: Namespace define, require calls when building Ace
......................................................................
Namespace define, require calls when building Ace
Bug: T127643
Change-Id: If425d96fa9e650ded2d3431d4c418f0fd1359af1
---
M Makefile
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Esanders: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Makefile b/Makefile
index fa80ce1..c5d81be 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@
refresh: ace-git
test -d modules/ace || mkdir modules/ace
(cd ace-git && git checkout master && git pull origin master)
- (cd ace-git && npm install && node ./Makefile.dryice.js)
- rsync -av ace-git/build/src/ modules/ace/
+ (cd ace-git && npm install && node ./Makefile.dryice.js -nc)
+ rsync -av ace-git/build/src-noconflict/ modules/ace/
cp ace-git/LICENSE modules/ace/LICENSE
ace-git:
--
To view, visit https://gerrit.wikimedia.org/r/277176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If425d96fa9e650ded2d3431d4c418f0fd1359af1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
