jenkins-bot has submitted this change and it was merged. Change subject: build: Switch back to upstream version of grunt-contrib-concat ......................................................................
build: Switch back to upstream version of grunt-contrib-concat We switched to a fork of mine last year because of a bug (upstream started to depend on unstable APIs not released in the version we have) and because of missing Source Maps support. Both have been merged and released upstream. https://github.com/gruntjs/grunt-contrib-concat/pull/59 https://github.com/gruntjs/grunt-contrib-concat/commits/v0.5.0 Bug: T116594 Change-Id: I9093fc4633106bfc121f66835e411cc09474712e --- M Gruntfile.js M package.json 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index 0391bb2..b6671a1 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -20,7 +20,7 @@ grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.loadNpmTasks( 'grunt-contrib-clean' ); - grunt.loadNpmTasks( 'grunt-contrib-concat-sourcemaps' ); + grunt.loadNpmTasks( 'grunt-contrib-concat' ); grunt.loadNpmTasks( 'grunt-contrib-copy' ); grunt.loadNpmTasks( 'grunt-contrib-csslint' ); grunt.loadNpmTasks( 'grunt-contrib-cssmin' ); diff --git a/package.json b/package.json index a9ff8b1..81830c7 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "grunt-banana-checker": "0.4.0", "grunt-cli": "0.1.13", "grunt-contrib-clean": "0.6.0", - "grunt-contrib-concat-sourcemaps": "0.6.0", + "grunt-contrib-concat": "0.5.1", "grunt-contrib-copy": "0.8.1", "grunt-contrib-csslint": "0.5.0", "grunt-contrib-cssmin": "0.14.0", -- To view, visit https://gerrit.wikimedia.org/r/248898 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9093fc4633106bfc121f66835e411cc09474712e Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Krinkle <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
