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

643a368f

There was a problem fetching the pipeline summary.

Verified Commit 643a368f authored 8 years ago by Dmitriy Zaporozhets

Downloads
- Patches
- Plain Diff

Make merge request diff works with new FileCollection logic


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

parent 5e95c0b8

Branches

Tags

Loading

Pipeline #

Changes 5
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

app/controllers/projects/merge_requests_controller.rb 1 addition, 1 deletion

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

app/models/merge_request.rb
app/models/merge_request_diff.rb 9 additions, 5 deletions

app/models/merge_request_diff.rb
app/views/projects/merge_requests/show/_diffs.html.haml 1 addition, 0 deletions

app/views/projects/merge_requests/show/_diffs.html.haml
lib/gitlab/diff/file_collection/merge_request_diff.rb 8 additions, 8 deletions

lib/gitlab/diff/file_collection/merge_request_diff.rb

with 22 additions and 17 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