Merge pull request #9545 from Baldinof/add_merged_label

Add merged label on branches page

1 files changed, 11 insertions, 0 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 0a62980f93a..3bba3ca888a 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -364,6 +364,17 @@ class Repository
     @root_ref ||= raw_repository.root_ref
   end
 
+  def merged_to_root_ref?(branch_name)
+    branch_commit = commit(branch_name)
+    root_ref_commit = commit(root_ref)
+
+    if branch_commit
+      rugged.merge_base(root_ref_commit.id, branch_commit.id) == branch_commit.id
+    else
+      nil
+    end
+  end
+
   def search_files(query, ref)
     offset = 2
     args = %W(git grep -i -n --before-context #{offset} --after-context #{offset} #{query} #{ref || root_ref})