diff options
| author | James Lopez <james@jameslopez.es> | 2016-12-16 10:46:59 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-12-16 16:47:28 +0100 |
| commit | 4bafa2bbc283e8c63abafde8338ee9ebd29857d7 (patch) | |
| tree | 362f78d6fe436cb70a5985aca9641af51c1724ab | |
| parent | f4804d4d87bc1a5972a61221fa74c517a12c6d09 (diff) | |
| download | gitlab-ce-4bafa2bbc283e8c63abafde8338ee9ebd29857d7.tar.gz | |
fix MR issue to do with merge user
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b73d7acefea..b1914df3020 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -97,7 +97,7 @@ class MergeRequest < ActiveRecord::Base validates :source_branch, presence: true validates :target_project, presence: true validates :target_branch, presence: true - validates :merge_user, presence: true, if: :merge_when_build_succeeds? + validates :merge_user, presence: true, if: :merge_when_build_succeeds?, unless: :importing? validate :validate_branches, unless: [:allow_broken, :importing?, :closed_without_fork?] validate :validate_fork, unless: :closed_without_fork? |