Dmitriy Zaporozhets 65b392c394 Merge branch 'merge-status-transition' into 'master' ...

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.

Spec and Spinach tests have been run locally and all pass.

See merge request !405

2015-03-20 20:11:04 +00:00

..

assets

Improve project name truncation on dashboard to work well with sm screen

2015-03-20 11:32:44 -07:00

controllers

Add error message when have error on profile screen

2015-03-19 23:31:25 -03:00

finders

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

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

helpers

Fix project issues and merge requests pages

2015-03-19 18:27:26 -07:00

mailers

Use group_member instead of users_group or membership.

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

models

Merge branch 'merge-status-transition' into 'master'

2015-03-20 20:11:04 +00:00

services

Merge branch 'fix-underscore-notes' into 'master'

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

uploaders

Fix URL to uploaded file.

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

views

Merge branch 'update_ui' into 'master'

2015-03-20 01:28:47 +00:00

workers

Fewer constants, more helpers.

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