kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Reuse `for_commit?` on conditional validations

This commit is contained in:
Douglas Barbosa Alexandre 2016-03-18 10:27:26 -03:00
parent a5bad46505
commit 2eeeb266e3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/todo.rb
View File

@ -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) }