[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: build: Always exclude vendor and node_modules

2017-09-16 Thread Umherirrender (Code Review) 
Umherirrender has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/376765 )

Change subject: build: Always exclude vendor and node_modules
..


build: Always exclude vendor and node_modules

Also use tabs in json

Change-Id: I5e70f06af43dba4d87d195c1ce66c43c549c4055
---
M Gruntfile.js
M composer.json
M package.json
3 files changed, 32 insertions(+), 31 deletions(-)

Approvals:
  Umherirrender: Verified
  Legoktm: Looks good to me, approved



diff --git a/Gruntfile.js b/Gruntfile.js
index 7756e75..a45071e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,7 +10,8 @@
jsonlint: {
all: [
'**/*.json',
-   '!node_modules/**'
+   '!node_modules/**',
+   '!vendor/**'
]
}
} );
diff --git a/composer.json b/composer.json
index a926f66..c27b1e7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,23 +1,23 @@
 {
-"name": "mediawiki/sendgrid",
-"require": {
-"php": ">=5.6",
-"sendgrid/sendgrid": "~6.0",
-"sendgrid/php-http-client": "~3.7"
-},
-"require-dev": {
-"phpunit/phpunit": "4.*",
-"squizlabs/php_codesniffer": "2.*",
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"jakub-onderka/php-console-highlighter": "0.3.2"
-},
-"scripts": {
-"test": [
-"parallel-lint . --exclude vendor"
-]
-},
-"config": {
-"optimize-autoloader": true,
-"prepend-autoloader": false
-}
+   "name": "mediawiki/sendgrid",
+   "require": {
+   "php": ">=5.6",
+   "sendgrid/sendgrid": "~6.0",
+   "sendgrid/php-http-client": "~3.7"
+   },
+   "require-dev": {
+   "phpunit/phpunit": "4.*",
+   "squizlabs/php_codesniffer": "2.*",
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "jakub-onderka/php-console-highlighter": "0.3.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   ]
+   },
+   "config": {
+   "optimize-autoloader": true,
+   "prepend-autoloader": false
+   }
 }
diff --git a/package.json b/package.json
index 3b4b5f0..6ff591b 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
-  "private": true,
-  "scripts": {
-"test": "grunt test"
-  },
-  "devDependencies": {
-"grunt": "1.0.1",
-"grunt-banana-checker": "0.4.0",
-"grunt-jsonlint": "1.0.7"
-  }
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.4.0",
+   "grunt-jsonlint": "1.0.7"
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/376765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e70f06af43dba4d87d195c1ce66c43c549c4055
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: build: Always exclude vendor and node_modules

2017-09-08 Thread Umherirrender (Code Review) 
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376765 )

Change subject: build: Always exclude vendor and node_modules
..

build: Always exclude vendor and node_modules

Also use tabs in json

Change-Id: I5e70f06af43dba4d87d195c1ce66c43c549c4055
---
M Gruntfile.js
M composer.json
M package.json
3 files changed, 32 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SendGrid 
refs/changes/65/376765/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 7756e75..a45071e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,7 +10,8 @@
jsonlint: {
all: [
'**/*.json',
-   '!node_modules/**'
+   '!node_modules/**',
+   '!vendor/**'
]
}
} );
diff --git a/composer.json b/composer.json
index a926f66..c27b1e7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,23 +1,23 @@
 {
-"name": "mediawiki/sendgrid",
-"require": {
-"php": ">=5.6",
-"sendgrid/sendgrid": "~6.0",
-"sendgrid/php-http-client": "~3.7"
-},
-"require-dev": {
-"phpunit/phpunit": "4.*",
-"squizlabs/php_codesniffer": "2.*",
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"jakub-onderka/php-console-highlighter": "0.3.2"
-},
-"scripts": {
-"test": [
-"parallel-lint . --exclude vendor"
-]
-},
-"config": {
-"optimize-autoloader": true,
-"prepend-autoloader": false
-}
+   "name": "mediawiki/sendgrid",
+   "require": {
+   "php": ">=5.6",
+   "sendgrid/sendgrid": "~6.0",
+   "sendgrid/php-http-client": "~3.7"
+   },
+   "require-dev": {
+   "phpunit/phpunit": "4.*",
+   "squizlabs/php_codesniffer": "2.*",
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "jakub-onderka/php-console-highlighter": "0.3.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   ]
+   },
+   "config": {
+   "optimize-autoloader": true,
+   "prepend-autoloader": false
+   }
 }
diff --git a/package.json b/package.json
index 3b4b5f0..6ff591b 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
-  "private": true,
-  "scripts": {
-"test": "grunt test"
-  },
-  "devDependencies": {
-"grunt": "1.0.1",
-"grunt-banana-checker": "0.4.0",
-"grunt-jsonlint": "1.0.7"
-  }
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.4.0",
+   "grunt-jsonlint": "1.0.7"
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/376765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e70f06af43dba4d87d195c1ce66c43c549c4055
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SendGrid
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits