Douwe Maan 79b4d0b0c0 Merge branch 'fix-stuck-mr' into 'master' ...

fix stuck MR

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

Fixes #348. Related to 6487419364.

See merge request !517

2015-04-14 07:48:29 +00:00

..

assets

Merge pull request #9076 from dsander/event-title-width

2015-04-10 21:29:52 +03:00

controllers

Merge branch 'skip-email-reconfirmation' into 'master'

2015-04-13 13:44:56 +00:00

finders

Fix tests and unassigned filter for issues. Updated CHANGELOG

2015-03-27 00:27:51 -07:00

helpers

Merge branch 'reference-access-control' into 'master'

2015-04-13 14:10:25 +00:00

mailers

Merge branch 'reference-access-control' into 'master'

2015-04-13 14:10:25 +00:00

models

fix stuck MR

2015-04-14 00:15:34 -07:00

services

Merge branch 'reference-access-control' into 'master'

2015-04-13 14:10:25 +00:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Merge branch 'empty-avatar-alt-text' into 'master'

2015-04-13 19:13:09 +00:00

workers

Merge branch 'regex-start-of-string' into 'master'

2015-04-12 07:36:40 +00:00