OSDN Git Service

Merge branch 'improve/mr_service' into 'master'
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 24 Jan 2014 16:10:48 +0000 (16:10 +0000)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 24 Jan 2014 16:10:48 +0000 (16:10 +0000)
commitbaccb9a4079311835f496f14a5dc411ac779bb23
tree720beaa21430687319025f1c586e5963a2b4b6cc
parentd1d138562a347ec78f0331d5242e28fbb368bad0
parent1338c7dd71555144286d751a5299366a5c13d2df
 Merge branch 'improve/mr_service' into 'master'

Improve merge request accepting logic

Add locked state to merge request during `accept` action.
Prevents mr being `triggered as merged` twice (hooks, emails etc)
Fixes #998 #729