diff options
| author | James Lopez <james@jameslopez.es> | 2016-12-16 09:13:58 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-12-19 16:52:38 +0100 |
| commit | 0631c7bcdce5dcb2aac94b1b755e63022a62469f (patch) | |
| tree | 2b65d4d82df50aa5584ef0f4095efa0b813ad67f /app/models/merge_request.rb | |
| parent | 01adeb17acccab09eb0074725050356d9d431c8a (diff) | |
| download | gitlab-ce-0631c7bcdce5dcb2aac94b1b755e63022a62469f.tar.gz | |
Fix MR issue to do with merge user
Diffstat (limited to 'app/models/merge_request.rb')
| -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? |