Remove requirement for base_commit_sha to allow creation of merge requests for orphaned branches

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Remove requirement for base_commit_sha to allow creation of merge requests for orphaned branches
8e031ce3 · Dmitriy Zaporozhets · 5cad2d29 · 8e031ce3
Commit 8e031ce3 authored Jul 28, 2016 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

merge_request_diff.rb app/models/merge_request_diff.rb +2 -3

No files found.
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -22,9 +22,8 @@ class MergeRequestDiff < ActiveRecord::Base
  serialize :st_commits
  serialize :st_diffs

-  validates :start_commit_sha, presence: true
-  validates :head_commit_sha,  presence: true
-  validates :base_commit_sha,  presence: true
+  validates :start_commit_sha, presence: true, unless: :importing?
+  validates :head_commit_sha,  presence: true, unless: :importing?

  after_initialize :set_diff_range, unless: :importing?
  after_create :save_git_content,   unless: :importing?