Loading merge request with removed source branch results in exception
Summary
Loading a merge request with removed source branch results in exception NoMethodError: undefined method 'raw' for nil:NilClass
Steps to reproduce
- Navigate to branches
- Delete branch associated with existing merge request
- Load merge request
What is the current bug behavior?
NoMethodError: undefined method 'raw' for nil:NilClass
from lib/gitlab/conflict/file_collection.rb:10:in `initialize'
from app/models/merge_request.rb:973:in `new'
from app/models/merge_request.rb:973:in `conflicts'
from app/models/merge_request.rb:993:in `conflicts_can_be_resolved_in_ui?'
from lib/gitlab/metrics/instrumentation.rb:156:in `block in conflicts_can_be_resolved_in_ui?'
from lib/gitlab/metrics/method_call.rb:23:in `measure'
from lib/gitlab/metrics/instrumentation.rb:156:in `conflicts_can_be_resolved_in_ui?'
from delegate.rb:83:in `method_missing'
What is the expected correct behavior?
Load the merge request and display message saying the source branch is removed.