Skip to content
This repository has been archived by the owner on Feb 11, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' into 2.0.0-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
travi committed Mar 6, 2018
2 parents 55c8205 + acbf8cb commit 32582b7
Show file tree
Hide file tree
Showing 22 changed files with 1,068 additions and 1,026 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ notifications:
email: false
before_script:
- npm run greenkeeper:update-lockfile
- npm ls >/dev/null
- npm ls --production >/dev/null
after_script: npm run greenkeeper:upload-lockfile
after_success:
- npm run coverage:report
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ hapi plugin to automatically merge and clean up passing greenkeeper PRs

[![npm](https://img.shields.io/npm/v/hapi-greenkeeper-keeper.svg?maxAge=2592000)](https://www.npmjs.com/package/hapi-greenkeeper-keeper)
[![license](https://img.shields.io/github/license/greenkeeper-keeper/hapi-greenkeeper-keeper.svg)](LICENSE)
[![Gitter](https://img.shields.io/gitter/room/greenkeeper-keeper/Lobby.svg)](https://gitter.im/greenkeeper-keeper/Lobby)

[![Build Status](https://img.shields.io/travis/greenkeeper-keeper/hapi-greenkeeper-keeper.svg?style=flat&branch=master)](https://travis-ci.org/greenkeeper-keeper/hapi-greenkeeper-keeper)
[![Codecov](https://img.shields.io/codecov/c/github/greenkeeper-keeper/hapi-greenkeeper-keeper.svg)](https://codecov.io/github/greenkeeper-keeper/hapi-greenkeeper-keeper)

[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
![greenkeeper badge](https://badges.greenkeeper.io/greenkeeper-keeper/hapi-greenkeeper-keeper.svg)
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
[![PRs Welcome][prs-badge]][prs]

## Installation

Expand Down Expand Up @@ -48,3 +50,6 @@ the plugin on your server.

_Note_: if you are using the new GitHub integration version of Greenkeeper,
branches are already deleted automatically

[prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
[prs]: http://makeapullrequest.com
Loading

0 comments on commit 32582b7

Please sign in to comment.