• Amy Troschinetz's avatar
    Fix issue with merge_pipeline when using ff merges · 252518a7
    Amy Troschinetz authored
    **app/models/merge_request.rb**:
    
    - Fix how `MergeRequest#merge_pipeline` is found to account for FF merge
    
    **changelogs/unreleased/fix-pipeline-link.yml**:
    
    - Changelog entry for this fix
    
    **spec/models/environment_status_spec.rb**:
    
    - Code this test was exercising is better covered in merge_request_spec
    
    **spec/models/merge_request_spec.rb**:
    
    - Test that new logic works in the face of FF merge and squash FF merge
    252518a7
merge_request.rb 51.9 KB