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
e3cc9d53
Commit
e3cc9d53
authored
Sep 17, 2018
by
Phil Hughes
Committed by
André Luís
Sep 21, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed karma spec for getNoteFormData
Fixed toggling new notes caused by not returning the stores discussion
parent
2497c29e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
app/assets/javascripts/notes/stores/actions.js
app/assets/javascripts/notes/stores/actions.js
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/javascripts/diffs/store/utils_spec.js
spec/javascripts/diffs/store/utils_spec.js
+1
-0
No files found.
app/assets/javascripts/notes/stores/actions.js
View file @
e3cc9d53
...
@@ -44,10 +44,10 @@ export const fetchDiscussions = ({ commit }, path) =>
...
@@ -44,10 +44,10 @@ export const fetchDiscussions = ({ commit }, path) =>
commit
(
types
.
SET_INITIAL_DISCUSSIONS
,
discussions
);
commit
(
types
.
SET_INITIAL_DISCUSSIONS
,
discussions
);
});
});
export
const
updateDiscussion
=
({
commit
},
discussion
)
=>
{
export
const
updateDiscussion
=
({
commit
,
state
},
discussion
)
=>
{
commit
(
types
.
UPDATE_DISCUSSION
,
discussion
);
commit
(
types
.
UPDATE_DISCUSSION
,
discussion
);
return
discussion
;
return
utils
.
findNoteObjectById
(
state
.
discussions
,
discussion
.
id
)
;
};
};
export
const
deleteNote
=
({
commit
,
dispatch
},
note
)
=>
export
const
deleteNote
=
({
commit
,
dispatch
},
note
)
=>
...
...
locale/gitlab.pot
View file @
e3cc9d53
...
@@ -3687,9 +3687,6 @@ msgstr ""
...
@@ -3687,9 +3687,6 @@ msgstr ""
msgid "MergeRequests|Toggle comments for this file"
msgid "MergeRequests|Toggle comments for this file"
msgstr ""
msgstr ""
msgid "MergeRequests|Updating discussions failed"
msgstr ""
msgid "MergeRequests|View file @ %{commitId}"
msgid "MergeRequests|View file @ %{commitId}"
msgstr ""
msgstr ""
...
...
spec/javascripts/diffs/store/utils_spec.js
View file @
e3cc9d53
...
@@ -136,6 +136,7 @@ describe('DiffsStoreUtils', () => {
...
@@ -136,6 +136,7 @@ describe('DiffsStoreUtils', () => {
note_project_id
:
''
,
note_project_id
:
''
,
target_type
:
options
.
noteableType
,
target_type
:
options
.
noteableType
,
target_id
:
options
.
noteableData
.
id
,
target_id
:
options
.
noteableData
.
id
,
return_discussion
:
'
true
'
,
note
:
{
note
:
{
noteable_type
:
options
.
noteableType
,
noteable_type
:
options
.
noteableType
,
noteable_id
:
options
.
noteableData
.
id
,
noteable_id
:
options
.
noteableData
.
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