diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-09-13 17:45:07 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-09-13 17:45:07 +0000 |
commit | 5bdaf5167cfbeda5a795e531097f300f4accf2a6 (patch) | |
tree | 384fe47bb776e884cb857a4dc2593f8fc24e5b12 /app | |
parent | e91a52619f129440b064b467b17917a7393a66a0 (diff) | |
parent | e12c2c77ce497eeaffa21f82890fc43fe0200af6 (diff) | |
download | gitlab-ce-5bdaf5167cfbeda5a795e531097f300f4accf2a6.tar.gz |
Merge branch 'mr-fixed-expanded-state-not-working' into 'master'
Fixed resolved discussions not toggling expanded on changes tab
Closes #51370
See merge request gitlab-org/gitlab-ce!21676
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/notes/stores/mutations.js | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js index 2c04bfea122..16bb54be126 100644 --- a/app/assets/javascripts/notes/stores/mutations.js +++ b/app/assets/javascripts/notes/stores/mutations.js @@ -214,12 +214,7 @@ export default { [types.SET_DISCUSSION_DIFF_LINES](state, { discussionId, diffLines }) { const discussion = utils.findNoteObjectById(state.discussions, discussionId); - const index = state.discussions.indexOf(discussion); - const discussionWithDiffLines = Object.assign({}, discussion, { - truncated_diff_lines: diffLines, - }); - - state.discussions.splice(index, 1, discussionWithDiffLines); + discussion.truncated_diff_lines = diffLines; }, }; |