Skip to content

Commit

Permalink
Merge pull request playframework#64 from renatocaval/templatecontrol-…
Browse files Browse the repository at this point in the history
…2.6.x

Upgrade branch 2.6.x using TemplateControl
  • Loading branch information
octonato committed Jan 17, 2019
2 parents 5e2b252 + 6403725 commit 3c83e55
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pull_request_rules:
- status-success=continuous-integration/travis-ci/pr
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- label=merge-when-green
- label!=block-merge
actions:
merge:
Expand All @@ -15,7 +14,6 @@ pull_request_rules:
conditions:
- status-success=continuous-integration/travis-ci/pr
- label=merge-when-green
- label=template-control
- label!=block-merge
actions:
merge:
Expand All @@ -35,19 +33,3 @@ pull_request_rules:
actions:
label:
remove: [merge-when-green]

- name: remove template-control label after merge
conditions:
- merged
- label=template-control
actions:
label:
remove: [template-control]

- name: auto add wip
conditions:
# match a few flavours of wip
- title~=^(\[wip\]( |:) |\[WIP\]( |:) |wip( |:) |WIP( |:)).*
actions:
label:
add: ["block-merge"]

0 comments on commit 3c83e55

Please sign in to comment.