File tree 1 file changed +4
-4
lines changed
1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ module.exports = queue => async context => {
39
39
}
40
40
41
41
const config = await getConfig ( context )
42
- const withMergeableLabels = thread . labels . filter ( l => {
42
+ const mergeableLabels = thread . labels . filter ( l => {
43
43
if ( typeof config . labels !== 'object' ) return false
44
44
if ( ! config . labels [ l . name ] ) return false
45
45
@@ -51,10 +51,10 @@ module.exports = queue => async context => {
51
51
return action && action . trim ( ) . toLowerCase ( ) === MERGE
52
52
} )
53
53
54
- if ( withMergeableLabels . length ) {
55
- const method = thread . labels . find ( ( { name } ) => name . match ( / r e b a s e / i) )
54
+ if ( mergeableLabels . length ) {
55
+ const method = mergeableLabels . find ( ( { name } ) => name . match ( / r e b a s e / i) )
56
56
? 'rebase'
57
- : thread . labels . find ( ( { name } ) => name . match ( / s q u a s h / i) )
57
+ : mergeableLabels . find ( ( { name } ) => name . match ( / s q u a s h / i) )
58
58
? 'squash'
59
59
: 'merge'
60
60
You can’t perform that action at this time.
0 commit comments