From 2eeeb266e36abdbe78be8f71081bb19e83175819 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 18 Mar 2016 10:27:26 -0300
Subject: [PATCH] Reuse `for_commit?` on conditional validations
---
app/models/todo.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/todo.rb b/app/models/todo.rb
index 024cdcc0d87..4be5806b8d1 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -29,8 +29,8 @@ class Todo < ActiveRecord::Base
delegate :name, :email, to: :author, prefix: true, allow_nil: true
validates :action, :project, :target_type, :user, presence: true
- validates :target_id, presence: true, if: ->(t) { t.target_type.present? && t.target_type != 'Commit' }
- validates :commit_id, presence: true, if: ->(t) { t.target_type.present? && t.target_type == 'Commit' }
+ validates :target_id, presence: true, unless: :for_commit?
+ validates :commit_id, presence: true, if: :for_commit?
default_scope { reorder(id: :desc) }
--
GitLab