Download as
Browse Code »

Commit 7b75f3cfd34820ecdf0eddb7703bdba1e4c23f9f

Authored by Dmitriy Zaporozhets
1 parent 828f84fd
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

show who merged request

Showing 3 changed files with 16 additions and 1 deletions   Show diff stats
app/models/merge_request.rb
  Diff comments   View file @7b75f3c
... ... @@ -68,6 +68,10 @@ class MergeRequest < ActiveRecord::Base
68 68 commits.first
69 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 75 # Return the number of +1 comments (upvotes)
72 76 def upvotes
73 77 notes.select(&:upvote?).size
... ...
app/models/project.rb
  Diff comments   View file @7b75f3c
... ... @@ -99,7 +99,8 @@ class Project < ActiveRecord::Base
99 99 Event.create(
100 100 :project => self,
101 101 :action => Event::Merged,
102   - :data => {:merge_request_id => merge_request.id},
  102 + :target_id => merge_request.id,
  103 + :target_type => "MergeRequest",
103 104 :author_id => user.id
104 105 )
105 106 end
... ...
app/views/merge_requests/show.html.haml
  Diff comments   View file @7b75f3c
... ... @@ -28,6 +28,16 @@
28 28 %hr
29 29 - if @merge_request.closed
30 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 41 - else
32 42 .alert-message.success
33 43 = link_to "#", :class => "info_link", :title => "How To Merge" do
... ...