Commit 7b75f3cfd34820ecdf0eddb7703bdba1e4c23f9f
1 parent
828f84fd
Exists in
master
and in
4 other branches
show who merged request
Showing
3 changed files
with
16 additions
and
1 deletions
Show diff stats
app/models/merge_request.rb
| @@ -68,6 +68,10 @@ class MergeRequest < ActiveRecord::Base | @@ -68,6 +68,10 @@ class MergeRequest < ActiveRecord::Base | ||
| 68 | commits.first | 68 | commits.first |
| 69 | end | 69 | end |
| 70 | 70 | ||
| 71 | + def merge_event | ||
| 72 | + self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Merged).last | ||
| 73 | + end | ||
| 74 | + | ||
| 71 | # Return the number of +1 comments (upvotes) | 75 | # Return the number of +1 comments (upvotes) |
| 72 | def upvotes | 76 | def upvotes |
| 73 | notes.select(&:upvote?).size | 77 | notes.select(&:upvote?).size |
app/models/project.rb
| @@ -99,7 +99,8 @@ class Project < ActiveRecord::Base | @@ -99,7 +99,8 @@ class Project < ActiveRecord::Base | ||
| 99 | Event.create( | 99 | Event.create( |
| 100 | :project => self, | 100 | :project => self, |
| 101 | :action => Event::Merged, | 101 | :action => Event::Merged, |
| 102 | - :data => {:merge_request_id => merge_request.id}, | 102 | + :target_id => merge_request.id, |
| 103 | + :target_type => "MergeRequest", | ||
| 103 | :author_id => user.id | 104 | :author_id => user.id |
| 104 | ) | 105 | ) |
| 105 | end | 106 | end |
app/views/merge_requests/show.html.haml
| @@ -28,6 +28,16 @@ | @@ -28,6 +28,16 @@ | ||
| 28 | %hr | 28 | %hr |
| 29 | - if @merge_request.closed | 29 | - if @merge_request.closed |
| 30 | .alert-message.error Closed | 30 | .alert-message.error Closed |
| 31 | + - if @merge_request.merged | ||
| 32 | + - event = @merge_request.merge_event | ||
| 33 | + %div | ||
| 34 | + %p | ||
| 35 | + %strong #{event.author_name} | ||
| 36 | + merged this request | ||
| 37 | + %span.cgray | ||
| 38 | + = time_ago_in_words(event.created_at) | ||
| 39 | + ago. | ||
| 40 | + %br | ||
| 31 | - else | 41 | - else |
| 32 | .alert-message.success | 42 | .alert-message.success |
| 33 | = link_to "#", :class => "info_link", :title => "How To Merge" do | 43 | = link_to "#", :class => "info_link", :title => "How To Merge" do |