diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-24 16:10:48 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-24 16:10:48 +0000 |
| commit | baccb9a4079311835f496f14a5dc411ac779bb23 (patch) | |
| tree | 720beaa21430687319025f1c586e5963a2b4b6cc /lib/api/notes.rb | |
| parent | d1d138562a347ec78f0331d5242e28fbb368bad0 (diff) | |
| parent | 1338c7dd71555144286d751a5299366a5c13d2df (diff) | |
| download | gitlab-ce-baccb9a4079311835f496f14a5dc411ac779bb23.tar.gz | |
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
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions