OSDN Git Service

Merge remote-tracking branch 'origin/merge_button'
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sat, 21 Apr 2012 09:22:56 +0000 (12:22 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sat, 21 Apr 2012 09:22:56 +0000 (12:22 +0300)
commit08994f3f6034eb214de4cda304d8797a51b2397a
tree4a2b2cf4d3dec5c9300bbd25a6dc4091cd80a14d
parent9af14e4bda3586d520c576911ecf109879f41aed
parent3a6694b5516f4c5015a7745cf8182e74597b39ad
Merge remote-tracking branch 'origin/merge_button'

Conflicts:
app/assets/javascripts/merge_requests.js
db/schema.rb
app/assets/javascripts/merge_requests.js
app/controllers/merge_requests_controller.rb
app/models/ability.rb
app/models/project/hooks_trait.rb
app/views/merge_requests/show.html.haml
config/routes.rb
db/schema.rb