Merge branch 'release/5.0.6'

adonisjs · Oct 1, 2018 · e8df485 · e8df485
2 parents b40fc33 + 9b1c368
commit e8df485
Show file tree

Hide file tree

Showing 11 changed files with 2,865 additions and 1,532 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -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/ace/CONTRIBUTING.md) doc
+- [ ] I have read the [CONTRIBUTING](https://github.com/adonisjs/ace/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)

diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@ npm-debug.log
 yarn.lock
 build
 dist
+shrinkwrap.yaml
+package-lock.json
diff --git a/.travis.yml b/.travis.yml
@@ -9,3 +9,5 @@ notifications:
   slack:
     secure: >-
       m91zkX2cLVDRDMBAUnR1d+hbZqtSHXLkuPencHadhJ3C3wm53Box8U25co/goAmjnW5HNJ1SMSIg+DojtgDhqTbReSh5gSbU0uU8YaF8smbvmUv3b2Q8PRCA7f6hQiea+a8+jAb7BOvwh66dV4Al/1DJ2b4tCjPuVuxQ96Wll7Pnj1S7yW/Hb8fQlr9wc+INXUZOe8erFin+508r5h1L4Xv0N5ZmNw+Gqvn2kPJD8f/YBPpx0AeZdDssTL0IOcol1+cDtDzMw5PAkGnqwamtxhnsw+i8OW4avFt1GrRNlz3eci5Cb3NQGjHxJf+JIALvBeSqkOEFJIFGqwAXMctJ9q8/7XyXk7jVFUg5+0Z74HIkBwdtLwi/BTyXMZAgsnDjndmR9HsuBP7OSTJF5/V7HCJZAaO9shEgS8DwR78owv9Fr5er5m9IMI+EgSH3qtb8iuuQaPtflbk+cPD3nmYbDqmPwkSCXcXRfq3IxdcV9hkiaAw52AIqqhnAXJWZfL6+Ct32i2mtSaov9FYtp/G0xb4tjrUAsDUd/AGmMJNEBVoHtP7mKjrVQ35cEtFwJr/8SmZxGvOaJXPaLs43dhXKa2tAGl11wF02d+Rz1HhbOoq9pJvJuqkLAVvRdBHUJrB4/hnTta5B0W5pe3mIgLw3AmOpk+s/H4hAP4Hp0gOWlPA=
+after_script:
+  - npm run coverage
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+<a name="5.0.6"></a>
+## [5.0.6](https://github.com/adonisjs/ace/compare/v5.0.5...v5.0.6) (2018-10-01)
+
+
+
 <a name="5.0.5"></a>
 ## [5.0.5](https://github.com/adonisjs/ace/compare/v5.0.4...v5.0.5) (2018-09-05)
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -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:
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,7 @@ install:
 test_script:
   - node --version
   - npm --version
-  - 'npm run test:win'
+  - npm run test
 build: 'off'
 clone_depth: 1
 matrix:

diff --git a/japaFile.js b/japaFile.js
@@ -1,2 +1,4 @@
-const cli = require('japa/cli')
-cli.run('test/**/*.spec.js')
+const { configure } = require('japa')
+configure({
+  files: ['test/**/*.spec.js']
+})