Skip to content

Commit e72cedf

Browse files
committed
don't use all labels, only merge ones
1 parent 8dec311 commit e72cedf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/pull/labeled.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module.exports = queue => async context => {
3939
}
4040

4141
const config = await getConfig(context)
42-
const withMergeableLabels = thread.labels.filter(l => {
42+
const mergeableLabels = thread.labels.filter(l => {
4343
if (typeof config.labels !== 'object') return false
4444
if (!config.labels[l.name]) return false
4545

@@ -51,10 +51,10 @@ module.exports = queue => async context => {
5151
return action && action.trim().toLowerCase() === MERGE
5252
})
5353

54-
if (withMergeableLabels.length) {
55-
const method = thread.labels.find(({ name }) => name.match(/rebase/i))
54+
if (mergeableLabels.length) {
55+
const method = mergeableLabels.find(({ name }) => name.match(/rebase/i))
5656
? 'rebase'
57-
: thread.labels.find(({ name }) => name.match(/squash/i))
57+
: mergeableLabels.find(({ name }) => name.match(/squash/i))
5858
? 'squash'
5959
: 'merge'
6060

0 commit comments

Comments
 (0)