Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
a773082e
Commit
a773082e
authored
Apr 22, 2019
by
Paul Slaughter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve EE / CE diff of noteable_discussion
parent
84a1e37f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+6
-1
No files found.
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
a773082e
...
@@ -454,8 +454,13 @@ Please check your network connection and try again.`;
...
@@ -454,8 +454,13 @@ Please check your network connection and try again.`;
</component>
</component>
</
template
>
</
template
>
</ul>
</ul>
<draft-note
v-if=
"showDraft(discussion.reply_id)"
:key=
"`draft_${discussion.id}`"
:draft=
"draftForDiscussion(discussion.reply_id)"
/>
<div
<div
v-if=
"isExpanded || !hasReplies"
v-
else-
if=
"isExpanded || !hasReplies"
:class=
"{ 'is-replying': isReplying }"
:class=
"{ 'is-replying': isReplying }"
class=
"discussion-reply-holder"
class=
"discussion-reply-holder"
>
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment