diff options
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 978727243f6..cd44a25fa82 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -12,6 +12,7 @@ class MergeRequest < ActiveRecord::Base validates_presence_of :author_id validates_presence_of :source_branch validates_presence_of :target_branch + validate :validate_branches delegate :name, :email, @@ -31,6 +32,13 @@ class MergeRequest < ActiveRecord::Base scope :closed, where(:closed => true) scope :assigned, lambda { |u| where(:assignee_id => u.id)} + + def validate_branches + if target_branch == source_branch + errors.add :base, "You can not use same branch for source and target branches" + end + end + def new? today? && created_at == updated_at end |