summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 1e73276efd2..8428c7c4cc6 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -18,8 +18,7 @@ class MergeRequest < ActiveRecord::Base
attr_accessor :should_remove_source_branch
- validates_presence_of :source_branch
- validates_presence_of :target_branch
+ validates_presence_of :source_branch, :target_branch
validate :validate_branches
def self.find_all_by_branch(branch_name)
@@ -187,6 +186,7 @@ class MergeRequest < ActiveRecord::Base
patch_path
end
end
+
# == Schema Information
#
# Table name: merge_requests
@@ -206,4 +206,3 @@ end
# merged :boolean default(FALSE), not null
# state :integer default(1), not null
#
-