OSDN Git Service

Better merge handling. show if MR can be accepted or not
authorrandx <dmitriy.zaporozhets@gmail.com>
Fri, 30 Mar 2012 05:05:04 +0000 (08:05 +0300)
committerrandx <dmitriy.zaporozhets@gmail.com>
Fri, 30 Mar 2012 05:05:04 +0000 (08:05 +0300)
commit411d84f385364be987380da5f0216048073609c9
treecc9e86019b41b2d3401131bfc6dc1f685422dab1
parentcd74f9da91cb1b798a8654f725b502bac256228d
Better merge handling. show if MR can be accepted or not
app/controllers/merge_requests_controller.rb
app/models/merge_request.rb
app/views/merge_requests/show.html.haml
db/migrate/20120329170745_add_automerge_to_merge_request.rb
db/schema.rb
lib/gitlab_merge.rb