Skip to content

Commit

Permalink
Merge branch 'release/3.0.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage committed Oct 1, 2018
2 parents b30ee72 + d701ddc commit 4aef9bb
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ _Put an `x` in the boxes that apply_

_Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._

- [ ] I have read the [CONTRIBUTING](https://github.com/adonisjs/adonis-mail/CONTRIBUTING.md) doc
- [ ] I have read the [CONTRIBUTING](https://github.com/adonisjs/adonis-mail/blob/develop/CONTRIBUTING.md) doc
- [ ] Lint and unit tests pass locally with my changes
- [ ] I have added tests that prove my fix is effective or that my feature works.
- [ ] I have added necessary documentation (if appropriate)
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<a name="3.0.9"></a>
## [3.0.9](https://github.com/adonisjs/adonis-mail/compare/v3.0.8...v3.0.9) (2018-10-01)



<a name="3.0.8"></a>
## [3.0.8](https://github.com/adonisjs/adonis-mail/compare/v3.0.7...v3.0.8) (2018-07-20)

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License

Copyright 2018 thetutlage, contributors
Copyright 2018 Harminder Virk, contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ install:
test_script:
- node --version
- npm --version
- 'npm run test:win'
- npm run test
build: 'off'
clone_depth: 1
matrix:
Expand Down
6 changes: 4 additions & 2 deletions japaFile.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
const cli = require('japa/cli')
cli.run('test/**/*.spec.js')
const { configure } = require('japa')
configure({
files: ['test/**/*.spec.js']
})
31 changes: 15 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adonisjs/mail",
"version": "3.0.8",
"version": "3.0.9",
"description": "Mail provider for adonis framework and has support for all common mailing services to send emails",
"main": "index.js",
"files": [
Expand All @@ -18,7 +18,7 @@
"mrm": "mrm --preset=@adonisjs/mrm-preset",
"pretest": "npm run lint",
"test:local": "FORCE_COLOR=true node bin/index.js --local",
"test": "nyc japa",
"test": "nyc node japaFile.js",
"test:win": "node ./node_modules/japa-cli/index.js",
"coverage": "nyc report --reporter=text-lcov | coveralls",
"commit": "git-cz",
Expand All @@ -32,22 +32,22 @@
"license": "MIT",
"devDependencies": {
"@adonisjs/fold": "^4.0.9",
"@adonisjs/mrm-preset": "^1.0.9",
"@adonisjs/sink": "^1.0.16",
"aws-sdk": "^2.275.1",
"@adonisjs/mrm-preset": "^1.0.13",
"@adonisjs/sink": "^1.0.17",
"aws-sdk": "^2.325.0",
"commitizen": "^2.10.1",
"coveralls": "^3.0.2",
"cz-conventional-changelog": "^2.1.0",
"dotenv": "^6.0.0",
"japa": "^1.0.6",
"japa": "^2.0.3",
"japa-cli": "^1.0.1",
"mailparser": "^2.2.0",
"mailparser": "^2.3.4",
"mrm": "^1.2.1",
"nodemailer-ses-transport": "^1.5.1",
"nyc": "^12.0.2",
"nyc": "^13.0.1",
"pkg-ok": "^2.2.0",
"semver": "^5.5.0",
"standard": "^11.0.1"
"semver": "^5.5.1",
"standard": "^12.0.1"
},
"config": {
"commitizen": {
Expand All @@ -56,8 +56,7 @@
},
"nyc": {
"exclude": [
"test",
"japaFile.js"
"test"
]
},
"standard": {
Expand All @@ -67,12 +66,12 @@
},
"dependencies": {
"@adonisjs/generic-exceptions": "^2.0.1",
"clone": "^2.1.1",
"debug": "^3.1.0",
"clone": "^2.1.2",
"debug": "^4.0.1",
"form-data": "^2.3.2",
"get-stream": "^3.0.0",
"get-stream": "^4.0.0",
"got": "8.3.0",
"nodemailer": "^4.6.7"
"nodemailer": "^4.6.8"
},
"repository": {
"type": "git",
Expand Down

0 comments on commit 4aef9bb

Please sign in to comment.