Commit Graph

6 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 9d85ea3acf Organize event order execution when update issue or mr 2015-01-25 22:49:05 -08:00
Dmitriy Zaporozhets ccdf08d80a Refactor merge request merge service
* Add system note when user merges MR in same way as it closes it
* Remove duplicating code
2015-01-06 16:24:47 -08:00
Jacob Vosmaer b5007c1565 Rename MergeRequest#lock! to #lock_mr!
As a warning from the StateMachine gem points out to us, there already
exists a method ActiveRecord#lock!. This change renames the `lock` and
`unlock` events defined on MergeRequest to `lock_mr` and `unlock_mr`.
2014-06-26 14:09:17 +02:00
Dmitriy Zaporozhets f08464c055
Remove author_id_of_changes from app
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 14:01:52 +02:00
Dmitriy Zaporozhets 80daf9a777
Use current_user for Notification#merge_mr
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 13:47:48 +02:00
Dmitriy Zaporozhets 48f741eed9
MergeRequests services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-24 14:18:32 +02:00