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
32cc246f
Commit
32cc246f
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
34f68b3e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
app/assets/javascripts/notes/components/note_body.vue
app/assets/javascripts/notes/components/note_body.vue
+6
-3
app/assets/javascripts/notes/mixins/get_discussion.js
app/assets/javascripts/notes/mixins/get_discussion.js
+7
-0
No files found.
app/assets/javascripts/notes/components/note_body.vue
View file @
32cc246f
<
script
>
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
{
mapActions
}
from
'
vuex
'
;
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
getDiscussion
from
'
ee_else_ce/notes/mixins/get_discussion
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
noteEditedText
from
'
./note_edited_text.vue
'
;
import
noteAwardsList
from
'
./note_awards_list.vue
'
;
import
noteAwardsList
from
'
./note_awards_list.vue
'
;
import
noteAttachment
from
'
./note_attachment.vue
'
;
import
noteAttachment
from
'
./note_attachment.vue
'
;
...
@@ -16,7 +17,7 @@ export default {
...
@@ -16,7 +17,7 @@ export default {
noteForm
,
noteForm
,
Suggestions
,
Suggestions
,
},
},
mixins
:
[
autosave
],
mixins
:
[
autosave
,
getDiscussion
],
props
:
{
props
:
{
note
:
{
note
:
{
type
:
Object
,
type
:
Object
,
...
@@ -76,8 +77,8 @@ export default {
...
@@ -76,8 +77,8 @@ export default {
renderGFM
()
{
renderGFM
()
{
$
(
this
.
$refs
[
'
note-body
'
]).
renderGFM
();
$
(
this
.
$refs
[
'
note-body
'
]).
renderGFM
();
},
},
handleFormUpdate
(
note
,
parentElement
,
callback
)
{
handleFormUpdate
(
note
,
parentElement
,
callback
,
resolveDiscussion
)
{
this
.
$emit
(
'
handleFormUpdate
'
,
note
,
parentElement
,
callback
);
this
.
$emit
(
'
handleFormUpdate
'
,
note
,
parentElement
,
callback
,
resolveDiscussion
);
},
},
formCancelHandler
(
shouldConfirm
,
isDirty
)
{
formCancelHandler
(
shouldConfirm
,
isDirty
)
{
this
.
$emit
(
'
cancelForm
'
,
shouldConfirm
,
isDirty
);
this
.
$emit
(
'
cancelForm
'
,
shouldConfirm
,
isDirty
);
...
@@ -111,6 +112,8 @@ export default {
...
@@ -111,6 +112,8 @@ export default {
:line=
"line"
:line=
"line"
:note=
"note"
:note=
"note"
:help-page-path=
"helpPagePath"
:help-page-path=
"helpPagePath"
:discussion=
"discussion"
:resolve-discussion=
"note.resolve_discussion"
@
handleFormUpdate=
"handleFormUpdate"
@
handleFormUpdate=
"handleFormUpdate"
@
cancelForm=
"formCancelHandler"
@
cancelForm=
"formCancelHandler"
/>
/>
...
...
app/assets/javascripts/notes/mixins/get_discussion.js
0 → 100644
View file @
32cc246f
export
default
{
computed
:
{
discussion
()
{
return
{};
},
},
};
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