DJ Mountney 415517918e Update merge_status state to allow more transitions ...

Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service.

2015-03-19 13:51:16 -07:00

..

assets

Merge branch 'add_canceled_ci_status' into 'master'

2015-03-19 17:21:20 +00:00

controllers

Only trigger actual search if a search string is present

2015-03-19 10:50:34 +01:00

finders

Merge pull request #8092 from cirosantilli/factor-finder-perms

2015-03-02 15:24:59 -08:00

helpers

Merge branch 'changelog-link' into 'master'

2015-03-18 18:02:39 +00:00

mailers

Use group_member instead of users_group or membership.

2015-03-15 13:49:41 +01:00

models

Update merge_status state to allow more transitions

2015-03-19 13:51:16 -07:00

services

Fewer constants, more helpers.

2015-03-19 10:34:04 +01:00

uploaders

Fix URL to uploaded file.

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

views

add canceled CI status

2015-03-19 18:27:24 +02:00

workers

Fewer constants, more helpers.

2015-03-19 10:34:04 +01:00