deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Constants in Events looks good now

Browse source
This commit is contained in:
Andrew8xx8 2013-02-13 15:48:16 +04:00
parent b9f8b40190
commit 839957cf56
13 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/merge_request.rb
View file

@ -133,11 +133,11 @@ class MergeRequest < ActiveRecord::Base
end
def merge_event
self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::Merged).last
self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
end
def closed_event
self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::Closed).last
self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
end
def commits
@ -184,7 +184,7 @@ class MergeRequest < ActiveRecord::Base
self.mark_as_merged!
Event.create(
project: self.project,
action: Event::Merged,
action: Event::MERGED,
target_id: self.id,
target_type: "MergeRequest",
author_id: user_id