diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-15 09:50:46 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-15 09:50:46 +0000 |
| commit | b409c376711f7130f20ded5732354b66428a2674 (patch) | |
| tree | a698c247eb9c234f24cadd01633fd52643273389 /spec/models/commit_spec.rb | |
| parent | 63b21945d2a6d53c7baa65bffcac33ab5fa8bb91 (diff) | |
| parent | f517dd2606e6d49a447cc952bd4b16ce017f1ddc (diff) | |
| download | gitlab-ce-b409c376711f7130f20ded5732354b66428a2674.tar.gz | |
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 6487419364fa9c179e24028d85b2be10d574067f. Replaces !517.
/cc @DouweM
See merge request !526
Diffstat (limited to 'spec/models/commit_spec.rb')
0 files changed, 0 insertions, 0 deletions