diff options
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 8428c7c4cc6..dc44d820560 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -7,6 +7,8 @@ class MergeRequest < ActiveRecord::Base attr_accessible :title, :assignee_id, :closed, :target_branch, :source_branch, :author_id_of_changes + attr_accessor :should_remove_source_branch + BROKEN_DIFF = "--broken-diff" UNCHECKED = 1 @@ -16,9 +18,8 @@ class MergeRequest < ActiveRecord::Base serialize :st_commits serialize :st_diffs - attr_accessor :should_remove_source_branch - - validates_presence_of :source_branch, :target_branch + validates :source_branch, presence: true + validates :target_branch, presence: true validate :validate_branches def self.find_all_by_branch(branch_name) |