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

2b1ddb0f

There was a problem fetching the pipeline summary.

Commit 2b1ddb0f authored 9 years ago by Robert Speicher

Downloads
- Plain Diff

Merge branch 'mr-merge-base' into 'master'

Correctly determine MR diff base when MR has merge conflicts

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779

See merge request !2632

parents 0e79b5f3 b7ec4762

No related branches found

No related tags found

No related merge requests found

Pipeline #

Changes 7
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
app/controllers/projects/compare_controller.rb 1 addition, 1 deletion

app/controllers/projects/compare_controller.rb
app/models/merge_request.rb 3 additions, 3 deletions

app/models/merge_request.rb
app/models/merge_request_diff.rb 11 additions, 17 deletions

app/models/merge_request_diff.rb
app/models/project.rb 5 additions, 0 deletions

app/models/project.rb
app/models/repository.rb 2 additions, 0 deletions

app/models/repository.rb
spec/models/build_spec.rb 1 addition, 1 deletion

spec/models/build_spec.rb

with 24 additions and 22 deletions

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