app/models/merge_request.rb · 155703c6132a86c13a18dba65da19129f49ea9c9 · iv / gitlab-ce · GitLab

Find file Blame History Permalink

Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine · 155703c6
Dmitriy Zaporozhets authored Feb 19, 2013
```
Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb
```
155703c6

merge_request.rb 5.8 KB