Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

7a7e9288

There was a problem fetching the pipeline summary.

Commit 7a7e9288 authored 7 years ago by Douwe Maan

Downloads
- Patches
- Plain Diff

Stop MR conflict code from blowing up when branches are missing

parent b46b52af

No related branches found

No related tags found

Loading

Pipeline #

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/models/merge_request.rb 2 additions, 0 deletions

app/models/merge_request.rb
app/services/merge_requests/conflicts/list_service.rb 1 addition, 0 deletions

app/services/merge_requests/conflicts/list_service.rb
lib/gitlab/diff/position_tracer.rb 1 addition, 1 deletion

lib/gitlab/diff/position_tracer.rb
spec/services/merge_requests/conflicts/list_service_spec.rb 7 additions, 0 deletions

spec/services/merge_requests/conflicts/list_service_spec.rb

with 11 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment