jenkins-bot has submitted this change and it was merged.
Change subject: grunt: Remove unused --qunit-file option
......................................................................
grunt: Remove unused --qunit-file option
Change-Id: I950ae4ae49a406d86e390d63992bc4ec9c485e8d
---
M tools/Gruntfile.js
M tools/package.json
2 files changed, 10 insertions(+), 14 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tools/Gruntfile.js b/tools/Gruntfile.js
index f9ba74c..a268067 100644
--- a/tools/Gruntfile.js
+++ b/tools/Gruntfile.js
@@ -16,16 +16,12 @@
qunit: {
all: ( function () {
var url = grunt.option( 'qunit-url' ),
- file = grunt.option( 'qunit-file' ),
ret = {};
if ( url ) {
ret.options = {
urls: [ url ],
timeout: 30 * 1000
};
- }
- if ( file ) {
- ret.src = [ file ];
}
return ret;
}() ),
diff --git a/tools/package.json b/tools/package.json
index 91b5a86..75696ab 100644
--- a/tools/package.json
+++ b/tools/package.json
@@ -1,12 +1,12 @@
{
- "name": "wikimedia-integration-jenkins",
- "version": "0.3.1",
- "dependencies": {
- "grunt": "0.4.5",
- "grunt-cli": "0.1.13",
- "grunt-contrib-qunit": "0.5.2",
- "phantomjs": "1.9.7-3",
- "grunt-contrib-csslint": "0.3.1",
- "jshint": "2.5.6"
- }
+ "name": "wikimedia-integration-jenkins",
+ "version": "0.3.1",
+ "dependencies": {
+ "grunt": "0.4.5",
+ "grunt-cli": "0.1.13",
+ "grunt-contrib-qunit": "0.5.2",
+ "phantomjs": "1.9.7-3",
+ "grunt-contrib-csslint": "0.3.1",
+ "jshint": "2.5.6"
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/173526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I950ae4ae49a406d86e390d63992bc4ec9c485e8d
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
