Merge branch 'fix-mr-comment-commit-pruned' into 'master'
Gracefully handle notes on deleted commits in merge requests Closes #3250 See merge request !3402
This commit is contained in:
commit
f7d20a6f76
|
@ -11,6 +11,7 @@ v 8.7.0 (unreleased)
|
||||||
- Handle nil descriptions in Slack issue messages (Stan Hu)
|
- Handle nil descriptions in Slack issue messages (Stan Hu)
|
||||||
- Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
|
- Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
|
||||||
- Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
|
- Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
|
||||||
|
- Gracefully handle notes on deleted commits in merge requests (Stan Hu)
|
||||||
|
|
||||||
v 8.6.2 (unreleased)
|
v 8.6.2 (unreleased)
|
||||||
- Comments on confidential issues don't show up in activity feed to non-members
|
- Comments on confidential issues don't show up in activity feed to non-members
|
||||||
|
|
|
@ -5,8 +5,10 @@ module NotesHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def note_target_fields(note)
|
def note_target_fields(note)
|
||||||
hidden_field_tag(:target_type, note.noteable.class.name.underscore) +
|
if note.noteable
|
||||||
hidden_field_tag(:target_id, note.noteable.id)
|
hidden_field_tag(:target_type, note.noteable.class.name.underscore) +
|
||||||
|
hidden_field_tag(:target_id, note.noteable.id)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def note_editable?(note)
|
def note_editable?(note)
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
- note = discussion_notes.first
|
- note = discussion_notes.first
|
||||||
|
- commit = note.noteable
|
||||||
|
- commit_description = commit ? 'commit' : 'a deleted commit'
|
||||||
.discussion.js-toggle-container{ class: note.discussion_id }
|
.discussion.js-toggle-container{ class: note.discussion_id }
|
||||||
.discussion-header
|
.discussion-header
|
||||||
.discussion-actions
|
.discussion-actions
|
||||||
|
@ -7,8 +9,9 @@
|
||||||
Show/hide discussion
|
Show/hide discussion
|
||||||
%div
|
%div
|
||||||
= link_to_member(@project, note.author, avatar: false)
|
= link_to_member(@project, note.author, avatar: false)
|
||||||
started a discussion on commit
|
%p started a discussion on #{commit_description}
|
||||||
= link_to(note.noteable.short_id, namespace_project_commit_path(note.project.namespace, note.project, note.noteable), class: 'monospace')
|
- if commit
|
||||||
|
= link_to(commit.short_id, namespace_project_commit_path(note.project.namespace, note.project, note.noteable), class: 'monospace')
|
||||||
.last-update.hide.js-toggle-content
|
.last-update.hide.js-toggle-content
|
||||||
- last_note = discussion_notes.last
|
- last_note = discussion_notes.last
|
||||||
last updated by
|
last updated by
|
||||||
|
|
Loading…
Reference in New Issue