Commit 45203dc4 authored by sbigelow's avatar sbigelow Committed by Sam Bigelow

Add message saying who resolved nondiff discussion

- Add resolution text to notes in MR Discussions
- Use slots to do so
parent 73d4b1f6
......@@ -378,6 +378,14 @@ Please check your network connection and try again.`;
:help-page-path="helpPagePath"
@handleDeleteNote="deleteNoteHandler"
>
<note-edited-text
v-if="discussion.resolved"
slot="discussion-resolved-text"
:edited-at="discussion.resolved_at"
:edited-by="discussion.resolved_by"
:action-text="resolvedText"
class-name="discussion-headline-light js-discussion-headline discussion-resolved-text"
/>
<slot slot="avatar-badge" name="avatar-badge"></slot>
</component>
<toggle-replies-widget
......
......@@ -195,7 +195,7 @@ export default {
:img-alt="author.name"
:img-size="40"
>
<slot slot="avatar-badge" name="avatar-badge"> </slot>
<slot slot="avatar-badge" name="avatar-badge"></slot>
</user-avatar-link>
</div>
<div class="timeline-content">
......@@ -227,6 +227,8 @@ export default {
@handleResolve="resolveHandler"
/>
</div>
<div class="timeline-discussion-body">
<slot name="discussion-resolved-text"></slot>
<note-body
ref="noteBody"
:note="note"
......@@ -238,5 +240,6 @@ export default {
@cancelForm="formCancelHandler"
/>
</div>
</div>
</timeline-entry-item>
</template>
......@@ -152,6 +152,16 @@ $note-form-margin-left: 72px;
display: block;
position: relative;
.timeline-discussion-body {
margin-top: -8px;
overflow-x: auto;
overflow-y: hidden;
.discussion-resolved-text {
margin-bottom: 8px;
}
}
.diff-content {
overflow: visible;
padding: 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment