diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-14 17:02:16 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-14 17:02:16 +0100 |
| commit | c8b92a4be2d526a128e17c784bd9af93e5ee91f5 (patch) | |
| tree | 9721643ba758ef55cc0bd12a539b66d60795421c /app/models/merge_request.rb | |
| parent | c305eb31aa1cf1aec24b907e0db1d7b2084400dc (diff) | |
| parent | ed3f44085e01f50864ce840f007a50d2154df6f5 (diff) | |
| download | gitlab-ce-c8b92a4be2d526a128e17c784bd9af93e5ee91f5.tar.gz | |
Merge branch 'master' into fixes/api
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b6ea85f6507..345b8d6e07d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -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 |