From 1d628555e1515568723977c063e827e25116c3ab Mon Sep 17 00:00:00 2001 From: Mick Ryan Date: Tue, 18 Feb 2020 16:10:42 -0800 Subject: [PATCH] chore(mergify): Add mergify.yml for mergify support (#395) * chore(mergify): Add mergify.yml for mergify support * chore(mergify): Add mergify badge to README.md --- .mergify.yml | 14 ++++++++++++++ README.md | 17 +++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 000000000..13032807a --- /dev/null +++ b/.mergify.yml @@ -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 \ No newline at end of file diff --git a/README.md b/README.md index 90b2fa6dd..83c7d3849 100644 --- a/README.md +++ b/README.md @@ -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) @@ -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. @@ -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, }); ``` @@ -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, }); ``` @@ -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