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

5e497e66

There was a problem fetching the pipeline summary.

Commit 5e497e66 authored 8 years ago by Robert Speicher

Downloads
- Plain Diff

Merge branch 'fix-discussions-on-changed-lines' into 'master'

Fix bug where notes weren’t shown in discussion when the code had changed after creation

See merge request !5908

parents 2e34e5f1 080924f9

No related branches found

No related tags found

Loading

Pipeline #

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/models/concerns/note_on_diff.rb 4 additions, 0 deletions

app/models/concerns/note_on_diff.rb
app/models/diff_note.rb 4 additions, 0 deletions

app/models/diff_note.rb
app/models/discussion.rb 1 addition, 0 deletions

app/models/discussion.rb
app/models/legacy_diff_note.rb 4 additions, 0 deletions

app/models/legacy_diff_note.rb
app/views/discussions/_diff_with_notes.html.haml 1 addition, 1 deletion

app/views/discussions/_diff_with_notes.html.haml

with 14 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