Prevent duplicate merge events

This commit is contained in:
Dmitriy Zaporozhets 2013-02-27 17:48:51 +02:00
parent 3c5954b8c8
commit b3d648b4e8
2 changed files with 15 additions and 8 deletions

View file

@ -177,15 +177,8 @@ class MergeRequest < ActiveRecord::Base
end
def merge!(user_id)
self.author_id_of_changes = user_id
self.merge
Event.create(
project: self.project,
action: Event::MERGED,
target_id: self.id,
target_type: "MergeRequest",
author_id: user_id
)
end
def automerge!(current_user)