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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a0556b6b
Commit
a0556b6b
authored
Apr 08, 2019
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed EE differences in note_body.vue
parent
f4c80603
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
8 deletions
+22
-8
app/assets/javascripts/notes/components/note_body.vue
app/assets/javascripts/notes/components/note_body.vue
+3
-8
app/assets/javascripts/notes/mixins/get_discussion.js
app/assets/javascripts/notes/mixins/get_discussion.js
+7
-0
ee/app/assets/javascripts/notes/mixins/get_discussion.js
ee/app/assets/javascripts/notes/mixins/get_discussion.js
+12
-0
No files found.
app/assets/javascripts/notes/components/note_body.vue
View file @
a0556b6b
<
script
>
import
{
map
Getters
,
map
Actions
}
from
'
vuex
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
$
from
'
jquery
'
;
import
getDiscussion
from
'
ee_else_ce/notes/mixins/get_discussion
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
noteAwardsList
from
'
./note_awards_list.vue
'
;
import
noteAttachment
from
'
./note_attachment.vue
'
;
...
...
@@ -16,7 +17,7 @@ export default {
noteForm
,
Suggestions
,
},
mixins
:
[
autosave
],
mixins
:
[
autosave
,
getDiscussion
],
props
:
{
note
:
{
type
:
Object
,
...
...
@@ -43,7 +44,6 @@ export default {
},
},
computed
:
{
...
mapGetters
([
'
getDiscussion
'
]),
noteBody
()
{
return
this
.
note
.
note
;
},
...
...
@@ -53,11 +53,6 @@ export default {
lineType
()
{
return
this
.
line
?
this
.
line
.
type
:
null
;
},
discussion
()
{
if
(
!
this
.
note
.
isDraft
)
return
{};
return
this
.
getDiscussion
(
this
.
note
.
discussion_id
);
},
},
mounted
()
{
this
.
renderGFM
();
...
...
app/assets/javascripts/notes/mixins/get_discussion.js
0 → 100644
View file @
a0556b6b
export
default
{
computed
:
{
discussion
()
{
return
{};
},
},
};
ee/app/assets/javascripts/notes/mixins/get_discussion.js
0 → 100644
View file @
a0556b6b
import
{
mapGetters
}
from
'
vuex
'
;
export
default
{
computed
:
{
...
mapGetters
([
'
getDiscussion
'
]),
discussion
()
{
if
(
!
this
.
note
.
isDraft
)
return
{};
return
this
.
getDiscussion
(
this
.
note
.
discussion_id
);
},
},
};
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