Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs

1 files changed, 10 insertions, 0 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 5579710a476..043f08b9a13 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -36,6 +36,7 @@
 #  build_coverage_regex   :string
 #  build_allow_git_fetch  :boolean          default(TRUE), not null
 #  build_timeout          :integer          default(3600), not null
+#  pending_delete         :boolean
 #
 
 require 'carrierwave/orm/activerecord'
@@ -348,6 +349,11 @@ class Project < ActiveRecord::Base
     repository.commit(id)
   end
 
+  def merge_base_commit(first_commit_id, second_commit_id)
+    sha = repository.merge_base(first_commit_id, second_commit_id)
+    repository.commit(sha) if sha
+  end
+
   def saved?
     id && persisted?
   end
@@ -904,4 +910,8 @@ class Project < ActiveRecord::Base
   def runners_token
     ensure_runners_token!
   end
+
+  def wiki
+    @wiki ||= ProjectWiki.new(self, self.owner)
+  end
 end