diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-05-13 17:25:00 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-05-13 17:31:59 -0500 |
| commit | 876dc7bacb5c2835537d13dfedd2f7ed55463c6b (patch) | |
| tree | f2153bd8f99fe55529f5576955edd1a792ff77a3 | |
| parent | e5ce1668061904a559ac6b9e5c830436fc743795 (diff) | |
| download | gitlab-ce-876dc7bacb5c2835537d13dfedd2f7ed55463c6b.tar.gz | |
Rename diff_with_notes partial.
| -rw-r--r-- | app/views/projects/notes/_discussion.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/discussions/_diff_with_notes.html.haml (renamed from app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml index aa26d8e87f1..7869d6413d8 100644 --- a/app/views/projects/notes/_discussion.html.haml +++ b/app/views/projects/notes/_discussion.html.haml @@ -41,6 +41,6 @@ .discussion-body.js-toggle-content{ class: ("hide" unless expanded) } - if note.diff_note? - = render "projects/notes/discussions/legacy_diff_with_notes", discussion_notes: discussion_notes + = render "projects/notes/discussions/diff_with_notes", discussion_notes: discussion_notes - else = render "projects/notes/discussions/notes", discussion_notes: discussion_notes diff --git a/app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml b/app/views/projects/notes/discussions/_diff_with_notes.html.haml index 6401245bf73..6401245bf73 100644 --- a/app/views/projects/notes/discussions/_legacy_diff_with_notes.html.haml +++ b/app/views/projects/notes/discussions/_diff_with_notes.html.haml |