diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 6782d738ca511851a001eeebcf848c33fe2fac82..da74baa208ab5e137deba8d32d69ca93e42eca80 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -68,6 +68,10 @@ class MergeRequest < ActiveRecord::Base commits.first end + def merge_event + self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Merged).last + end + # Return the number of +1 comments (upvotes) def upvotes notes.select(&:upvote?).size diff --git a/app/models/project.rb b/app/models/project.rb index 28f0329784b111a4a0c703e6b1b77f82bc71e7ac..08a12d7d8b5a58dfea25e66d11911071cb1e34bc 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -99,7 +99,8 @@ class Project < ActiveRecord::Base Event.create( :project => self, :action => Event::Merged, - :data => {:merge_request_id => merge_request.id}, + :target_id => merge_request.id, + :target_type => "MergeRequest", :author_id => user.id ) end diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index 3db247742e06b505c502329f9d1863c7739730e0..44291cf4e46cf7decac640fd307e67538ce3cfb0 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -28,6 +28,16 @@ %hr - if @merge_request.closed .alert-message.error Closed + - if @merge_request.merged + - event = @merge_request.merge_event + %div + %p + %strong #{event.author_name} + merged this request + %span.cgray + = time_ago_in_words(event.created_at) + ago. + %br - else .alert-message.success = link_to "#", :class => "info_link", :title => "How To Merge" do