Skip to content

Commit

Permalink
Merge branch '1.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
andrerom committed May 8, 2019
2 parents 1523ef3 + ebdddcc commit b5596cb
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
15 changes: 15 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
| Question | Answer
| ------------------ | ------------------
| **JIRA issue** | [EZP-XXXXX](https://jira.ez.no/browse/EZP-XXXXX)
| **Type** | Bug/Improvement/Feature/Misc
| **Target version** | latest stable `1.8` for bug fixes, `master` for new features
| **BC breaks** | yes/no
| **Doc needed** | yes/no

<!-- Replace this comment with Pull Request description -->

**TODO**:
- [ ] Implement feature / fix a bug.
- [ ] Implement tests + specs and passing (`$ composer test`)
- [ ] Fix new code according to Coding Standards (`$ composer fix-cs`).
- [ ] Ask for Code Review.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ matrix:
branches:
only:
- master

- /^\d.\d+$/

# setup requirements for running db tests
before_install:
Expand Down

0 comments on commit b5596cb

Please sign in to comment.