OSDN Git Service

Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev...
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tue, 26 Feb 2013 08:38:40 +0000 (10:38 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tue, 26 Feb 2013 08:38:40 +0000 (10:38 +0200)
commitd7b667fee238cfd457bdc143a37585ac931cf4ad
tree81f5eb8aba67e9fb872c4aa736b7c148f912d79e
parent0cc95ef2f56c4b779fca613c61789483fa8d2ae8
parent6d68923edceb23ae6a5281e022a351a0d9c0d59b
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2

Conflicts:
app/models/merge_request.rb
app/controllers/merge_requests_controller.rb
app/models/merge_request.rb
app/models/project.rb
db/schema.rb