diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-21 14:07:37 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-21 23:19:07 -0700 |
| commit | 37a335e60edd4f4c8b61fd2f9ffe0f1d27e3bfb8 (patch) | |
| tree | 1e1d0aad5fdfe0ba1a9cecae6c402313b7be5c54 /app/models | |
| parent | d707e2a49f2efe4670b5ebe62fb61554640ca7e9 (diff) | |
| download | gitlab-ce-37a335e60edd4f4c8b61fd2f9ffe0f1d27e3bfb8.tar.gz | |
Fix remaining failures in shoulda-matcher
Starting with Rails 5, belongs_to now adds a presence validation to the
association, and so as of shoulda-matchers 4.0.0 the belong_to matcher
follows suit and tests that this validation is there by setting the
association to nil and asserting that there are validation errors. This
exposed an error with the `validate_branches` method: we need to check
the source and target project exist.
Diffstat (limited to 'app/models')
| -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 |