Skip to content
Commit b409c376 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'fix-stuck-mr' into 'master'

fix stuck mr

If `locked?` & `locked_at.nil?` is nil return that the merge has been locked long enough and those are old merges stuck in locked state.

Fixes #348. Related to 64874193. Replaces !517.

/cc @DouweM

See merge request !526
parents 63b21945 f517dd26
Loading
Loading
Loading