Merge pull request #3112 from element-hq/robin/blocked-conflicts
Run the 'prevent blocked' workflow even if PR has conflicts
This commit is contained in:
2
.github/workflows/blocked.yaml
vendored
2
.github/workflows/blocked.yaml
vendored
@@ -1,6 +1,6 @@
|
|||||||
name: Prevent blocked
|
name: Prevent blocked
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request_target:
|
||||||
types: [opened, labeled, unlabeled]
|
types: [opened, labeled, unlabeled]
|
||||||
jobs:
|
jobs:
|
||||||
prevent-blocked:
|
prevent-blocked:
|
||||||
|
|||||||
Reference in New Issue
Block a user