Merge branch 'new-docs-topic-issues' of gitlab.com:gitlab-org/gitlab-ce into new-docs-topic-issuesnew-docs-topic-issues

1 files changed, 7 insertions, 1 deletions

diff --git a/app/models/todo.rb b/app/models/todo.rb
index f5ade1cc293..4c99aa0d3be 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -6,13 +6,15 @@ class Todo < ActiveRecord::Base
   BUILD_FAILED      = 3
   MARKED            = 4
   APPROVAL_REQUIRED = 5 # This is an EE-only feature
+  UNMERGEABLE       = 6
 
   ACTION_NAMES = {
     ASSIGNED => :assigned,
     MENTIONED => :mentioned,
     BUILD_FAILED => :build_failed,
     MARKED => :marked,
-    APPROVAL_REQUIRED => :approval_required
+    APPROVAL_REQUIRED => :approval_required,
+    UNMERGEABLE => :unmergeable
   }
 
   belongs_to :author, class_name: "User"
@@ -66,6 +68,10 @@ class Todo < ActiveRecord::Base
     end
   end
 
+  def unmergeable?
+    action == UNMERGEABLE
+  end
+
   def build_failed?
     action == BUILD_FAILED
   end