Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196311
Change subject: Merge REL1_23 into fundraising/REL1_23
......................................................................
Merge REL1_23 into fundraising/REL1_23
0d304c1bcacc6b0f8165569963393b0102a63314 PostgreSQL: Fix Special:ActiveUsers
GROUP BY query
263c03eb4c5d48936b6041326cc7e5811887ae04 tests: Move npm-test to repo root
0112e62b53aed8205e0306fd0433753b399ab580 jquery.badge: Swap non-breaking space
character for regular space
1d7cbbe571342e8fe9f19269d04809807519748c resourceloader: Call setName() in test
suite before calling getStyles()
8e7b7728983252da81f7629a72afed9f6827753d Rename JSDuck config to standard
'jsduck'
Change-Id: I6ffc03fa2e644a8f6dd0616c87748aceff7af82d
---
M Gruntfile.js
M package.json
2 files changed, 0 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/11/196311/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 689d4ca..9badf03 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,43 +1,5 @@
/*jshint node:true */
module.exports = function ( grunt ) {
-<<<<<<< HEAD (a6c451 update DonationInterface submodule)
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-contrib-watch' );
- grunt.loadNpmTasks( 'grunt-jscs-checker' );
-
- grunt.initConfig( {
- pkg: grunt.file.readJSON( 'package.json' ),
- jshint: {
- options: {
- jshintrc: '.jshintrc'
- },
- all: [ '*.js',
'{includes,languages,resources,skins,tests}/**/*.js' ]
- },
- jscs: {
- // Known issues:
- // - https://github.com/mdevils/node-jscs/issues/277
- // - https://github.com/mdevils/node-jscs/issues/278
- all: [
- '<%= jshint.all %>',
- // Auto-generated file with JSON (double quotes)
- '!tests/qunit/data/mediawiki.jqueryMsg.data.js'
-
- // Exclude all files ignored by jshint
- ].concat( grunt.file.read( '.jshintignore' ).split(
'\n' ).reduce( function ( patterns, pattern ) {
- // Filter out empty lines
- if ( pattern.length && pattern[0] !== '#' ) {
- patterns.push( '!' + pattern );
- }
- return patterns;
- }, [] ) )
- },
- watch: {
- files: [
- '.{jshintrc,jscs.json,jshintignore,csslintrc}',
- '<%= jshint.all %>'
- ],
- tasks: ['test']
-=======
grunt.loadNpmTasks( 'grunt-contrib-copy' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
@@ -85,7 +47,6 @@
return require( 'path' ).join( dest,
src.replace( 'resources/', '' ) );
}
}
->>>>>>> BRANCH (8e7b77 Rename JSDuck config to standard 'jsduck')
}
} );
diff --git a/package.json b/package.json
index 30ffc40..a9b9148 100644
--- a/package.json
+++ b/package.json
@@ -2,13 +2,6 @@
"name": "mediawiki",
"version": "0.0.0",
"scripts": {
-<<<<<<< HEAD (a6c451 update DonationInterface submodule)
- "test": "grunt test"
- },
- "devDependencies": {
- "grunt": "0.4.2",
- "grunt-contrib-jshint": "0.9.2",
-=======
"test": "grunt test",
"doc": "jsduck",
"postdoc": "grunt copy:jsduck"
@@ -17,7 +10,6 @@
"grunt": "0.4.2",
"grunt-contrib-jshint": "0.9.2",
"grunt-contrib-copy": "0.8.0",
->>>>>>> BRANCH (8e7b77 Rename JSDuck config to standard 'jsduck')
"grunt-contrib-watch": "0.6.1",
"grunt-jscs-checker": "0.4.1"
}
--
To view, visit https://gerrit.wikimedia.org/r/196311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ffc03fa2e644a8f6dd0616c87748aceff7af82d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_23
Gerrit-Owner: Awight <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
