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

..

concerns

tests

2015-03-16 21:38:41 +02:00

hooks

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

members

Use project_member instead of team_member.

2015-03-15 13:50:38 +01:00

network

Merge pull request #7999 from cirosantilli/append-inplace

2015-01-21 23:07:15 -08:00

project_services

Merge branch 'external_wiki' into 'master'

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

.gitkeep

init commit

2011-10-09 00:36:38 +03:00

ability.rb

Merge branch 'fix-restricted-visibility' into 'master'

2015-03-16 17:49:46 +00:00

application_setting.rb

Fix restricted visibility bugs

2015-03-16 13:59:50 -06:00

broadcast_message.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

commit.rb

Rubocop: Style/ElseAlignment enabled

2015-02-02 21:38:50 -08:00

deploy_key.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

deploy_keys_project.rb

Delete deploy key when last connection to a project is destroyed.

2015-03-17 14:55:43 +01:00

diff_line.rb

Refactor Parallel Diff feature and add scrollbars

2014-03-27 09:15:25 +13:00

email.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

event.rb

List new commits for newly pushed branch in activity view.

2015-03-18 14:28:50 +01:00

external_issue.rb

Add ExternalIssue base model to make issue referencing more robust for external issue trackers.

2015-02-11 09:21:57 -08:00

forked_project_link.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

group_milestone.rb

Remove duplicates from group milestone participants list.

2015-02-05 21:26:57 +01:00

group.rb

Split up AttachmentUploader.

2015-02-20 15:19:50 +01:00

identity.rb

Re-annotate models

2015-03-04 14:14:00 -08:00

issue.rb

Remove old team scopes.

2015-03-15 13:50:38 +01:00

key.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

label_link.rb

Annotate models

2014-08-25 12:25:02 +03:00

label.rb

Apply default scope to labels and remove one for notes

2015-02-05 20:29:41 -08:00

member.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

merge_request_diff.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

merge_request.rb

Update merge_status state to allow more transitions

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

milestone.rb

Fix method overlap for issue sorting

2015-02-05 16:49:41 -08:00

namespace.rb

Fix import check for case sensetive namespaces

2015-03-02 23:06:59 -08:00

note.rb

Fix cross references when usernames, milestones, or project names contain underscores.

2015-03-19 07:07:30 -07:00

notification.rb

New feature: add 'Mention' notification level

2014-12-29 15:55:21 +02:00

personal_snippet.rb

annotate

2014-10-09 18:22:20 +03:00

project_contributions.rb

Extend the commit calendar to show the actual commits for a date

2015-03-18 08:42:42 +01:00

project_snippet.rb

annotate

2014-10-09 18:22:20 +03:00

project_team.rb

Use member instead of tm.

2015-03-15 13:50:38 +01:00

project_wiki.rb

Rubocop enabled for: Use spaces inside hash literal braces

2015-02-02 20:36:54 -08:00

project.rb

Fix external wiki service

2015-03-17 22:59:45 -07:00

protected_branch.rb

Annotate models

2015-01-22 09:40:03 -08:00

repository.rb

Merge branch 'changelog-link' into 'master'

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

service.rb

Fix external wiki service

2015-03-17 22:59:45 -07:00

snippet.rb

Added comment notification events to HipChat and Slack services.

2015-03-06 06:54:00 -08:00

subscription.rb

tests

2015-03-16 21:38:41 +02:00

tree.rb

Fix tree readme.

2015-03-18 14:08:26 +01:00

user.rb

Use project_member instead of team_member.

2015-03-15 13:50:38 +01:00

users_star_project.rb

Annotate models

2014-08-25 12:25:02 +03:00

wiki_page.rb

Rubocop: Style/Alias enabled

2015-02-02 20:57:10 -08:00