Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- 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

9d2ca3f5

Commit 9d2ca3f5 authored 7 years ago by Douwe Maan

Downloads
- Plain Diff

Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master'

Fix diffs with edit-forking needs

Closes #31276

See merge request !10868

parents 04811cbb a27b59f6

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/merge_request_tabs.js 11 additions, 0 deletions

app/assets/javascripts/merge_request_tabs.js
app/helpers/blob_helper.rb 1 addition, 1 deletion

app/helpers/blob_helper.rb
app/views/projects/_fork_suggestion.html.haml 11 additions, 0 deletions

app/views/projects/_fork_suggestion.html.haml
app/views/projects/blob/_header.html.haml 1 addition, 11 deletions

app/views/projects/blob/_header.html.haml
app/views/projects/diffs/_file.html.haml 2 additions, 0 deletions

app/views/projects/diffs/_file.html.haml
spec/features/merge_requests/diffs_spec.rb 38 additions, 9 deletions

spec/features/merge_requests/diffs_spec.rb

with 64 additions and 21 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