diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2019-05-22 14:08:38 +0000 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2019-05-22 14:08:38 +0000 |
| commit | bc4a18ecb9e85a5ee51541ed25b2cb9c4a2768b5 (patch) | |
| tree | fdcc55def50b3436eab55a0a4c930c15c24dc795 /app | |
| parent | 744f1f2e7037f5c70c3168d9e2e89b1c327465d2 (diff) | |
| parent | 37a335e60edd4f4c8b61fd2f9ffe0f1d27e3bfb8 (diff) | |
| download | gitlab-ce-bc4a18ecb9e85a5ee51541ed25b2cb9c4a2768b5.tar.gz | |
Merge branch 'sh-bump-shoulda-matcher' into 'master'
Bump shoulda-matchers to 4.0.1
See merge request gitlab-org/gitlab-ce!28443
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index df162e4844c..311ba1ce6bd 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -581,6 +581,8 @@ class MergeRequest < ApplicationRecord end def validate_branches + return unless target_project && source_project + if target_project == source_project && target_branch == source_branch errors.add :branch_conflict, "You can't use same project/branch for source and target" return |