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

7a5e653f

There was a problem fetching the pipeline summary.

Commit 7a5e653f authored 8 years ago by Sean McGivern

Downloads
- Plain Diff

Merge branch 'hide-empty-merge-request-diffs' into 'master'

Fix errors happening when source branch of merge request is removed and then restored

See merge request !7568

parents 06cf647c 35615bc3

No related branches found

No related tags found

Loading

Pipeline #

Changes 9
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

app/controllers/projects/merge_requests_controller.rb 4 additions, 4 deletions

app/controllers/projects/merge_requests_controller.rb
app/models/merge_request_diff.rb 4 additions, 2 deletions

app/models/merge_request_diff.rb
app/services/merge_requests/refresh_service.rb 9 additions, 12 deletions

app/services/merge_requests/refresh_service.rb
app/views/projects/merge_requests/widget/_open.html.haml 2 additions, 2 deletions

app/views/projects/merge_requests/widget/_open.html.haml
changelogs/unreleased/fix-merge-request-screen-deleted-source-branch.yml 0 additions, 4 deletions

...leased/fix-merge-request-screen-deleted-source-branch.yml
changelogs/unreleased/hide-empty-merge-request-diffs.yml 4 additions, 0 deletions

changelogs/unreleased/hide-empty-merge-request-diffs.yml
spec/features/merge_requests/deleted_source_branch_spec.rb 30 additions, 0 deletions

spec/features/merge_requests/deleted_source_branch_spec.rb
spec/features/merge_requests/merge_request_versions_spec.rb 4 additions, 3 deletions

spec/features/merge_requests/merge_request_versions_spec.rb
spec/services/merge_requests/refresh_service_spec.rb 0 additions, 10 deletions

spec/services/merge_requests/refresh_service_spec.rb

with 57 additions and 37 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