OSDN Git Service

Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 26 Sep 2013 19:19:01 +0000 (22:19 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 26 Sep 2013 19:19:01 +0000 (22:19 +0300)
commit052a7cc9cdc0fb14a55e7a7d71a8e4696c909658
tree4686d485901a31637fee8f8d51f306e905fc69dc
parent9bb1e15c830341f27aa976785bd1504ad98b5fb1
parentfb8a3e319a59cedd19191a169cfae08b2923ecbe
Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2

Conflicts:
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb