Skip to content

Commit

Permalink
chore(mergify): Add mergify.yml for mergify support (#395)
Browse files Browse the repository at this point in the history
* chore(mergify): Add mergify.yml for mergify support

* chore(mergify): Add mergify badge to README.md
  • Loading branch information
mickr authored Feb 19, 2020
1 parent d59f278 commit 1d62855
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 8 deletions.
14 changes: 14 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
pull_request_rules:
- name: Automatic strict merge
conditions:
- base=master
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- "#review-requested=0"
- status-success=Travis CI - Pull Request
- label=ready-to-merge
- label!=do-not-merge
actions:
merge:
method: squash
strict: smart
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![Project Status](https://img.shields.io/badge/status-active-brightgreen.svg)](http://opensource.box.com/badges)
[![Mergify Status](https://img.shields.io/endpoint.svg?url=https://gh.mergify.io/badges/box/box-annotations&style=flat)](https://mergify.io)
[![Styled With Prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
[![build status](https://travis-ci.com/box/box-annotations.svg?branch=master)](https://travis-ci.com/box/box-annotations)
[![version](https://img.shields.io/badge/version-v3.13.0-blue.svg)](https://github.com/box/box-annotations)
Expand All @@ -12,8 +13,8 @@ Box Content Preview currently supports four annotation types - highlight comment

## Browser Support

* Desktop Chrome, Firefox, Safari, Edge, and Internet Explorer 11
* Mobile support available for iOS Safari, Android Chrome
- Desktop Chrome, Firefox, Safari, Edge, and Internet Explorer 11
- Mobile support available for iOS Safari, Android Chrome

If you are using Internet Explorer 11, which doesn't natively support promises, include a polyfill.io script (see sample code below) or a Promise library like Bluebird.

Expand All @@ -30,8 +31,8 @@ Box Annotations can be used by pulling from our [NPM package](https://www.npmjs.
```javascript
var preview = new Box.Preview();
preview.show('FILE_ID', 'ACCESS_TOKEN', {
container: '.preview-container',
showAnnotations: true
container: '.preview-container',
showAnnotations: true,
});
```

Expand All @@ -47,8 +48,8 @@ const boxAnnotations = new BoxAnnotations(viewerOptions);

var preview = new Box.Preview();
preview.show(FILE_ID, ACCESS_TOKEN, {
container: '.preview-container',
boxAnnotations
container: '.preview-container',
boxAnnotations,
});
```

Expand All @@ -72,8 +73,8 @@ Supported image file extensions: `ai, bmp, dcm, eps, gif, png, ps, psd, svs, tga

## Development

* [Dev Setup](docs/dev-setup.md)
* [Contributing](docs/contributing.md)
- [Dev Setup](docs/dev-setup.md)
- [Contributing](docs/contributing.md)

## Support

Expand Down

0 comments on commit 1d62855

Please sign in to comment.