From 5f1091546bd17060e70635d0d4880b62b0d80353 Mon Sep 17 00:00:00 2001 From: Conrad Chan Date: Wed, 19 Jun 2019 13:00:19 -0700 Subject: [PATCH] Build: Add Mergify configuration (#1023) --- .mergify.yml | 14 ++++++++++++++ README.md | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 000000000..b072aa091 --- /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 diff --git a/README.md b/README.md index e4414c2ae..c0e902e38 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Project Status](https://img.shields.io/badge/status-active-brightgreen.svg?style=flat-square)](http://opensource.box.com/badges/) +[![Mergify Status](https://img.shields.io/endpoint.svg?url=https://gh.mergify.io/badges/box/box-content-preview&style=flat)](https://mergify.io) [![Styled With Prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier) [![build status](https://img.shields.io/travis/box/box-content-preview/master.svg?style=flat-square)](https://travis-ci.org/box/box-content-preview) [![version](https://img.shields.io/badge/version-v2.12.0-blue.svg?style=flat-square)](https://github.com/box/box-content-preview) @@ -22,7 +23,7 @@ Current Version * Version: v2.12.0 * Locale: en-US -https://cdn01.boxcdn.net/platform/preview/2.12.0/en-US/preview.js +https://cdn01.boxcdn.net/platform/preview/2.12.0/en-US/preview.js https://cdn01.boxcdn.net/platform/preview/2.12.0/en-US/preview.css Supported Locales