From 2f048df4a4a83ff009d2ef2d14ee04e5a2798618 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Wed, 18 Nov 2015 11:17:41 +0100
Subject: API support, incorporated feedback

---
 app/models/merge_request.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/models/merge_request.rb')

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index c5f04dbcf4c..7b372399a3a 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -253,6 +253,10 @@ class MergeRequest < ActiveRecord::Base
     end
   end
 
+  def mergeable_by_or_author(user)
+    self.can_be_merged_by?(user) || self.author == user
+  end
+
   def mr_and_commit_notes
     # Fetch comments only from last 100 commits
     commits_for_notes_limit = 100
@@ -390,7 +394,7 @@ class MergeRequest < ActiveRecord::Base
 
   def reset_merge_when_build_succeeds
     return unless merge_when_build_succeeds?
-    
+
     self.merge_when_build_succeeds = false
     self.merge_user = nil
     self.merge_params = nil
-- 
cgit v1.2.1