summaryrefslogtreecommitdiff
path: root/spec/javascripts/notes/stores
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-11-01 15:19:22 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-11-01 15:19:22 +0000
commit6848c4f93c7727d6975632135a04c5633c1781f1 (patch)
tree79de7b002747e9906e7563a81bba5a1f1979b679 /spec/javascripts/notes/stores
parentccd8cd283c4fade866542ea70caed770f675940c (diff)
parentd3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff)
downloadgitlab-ce-gl-ui-tooltip.tar.gz
Merge branch 'master' into 'gl-ui-tooltip'gl-ui-tooltip
# Conflicts: # app/assets/javascripts/commons/gitlab_ui.js
Diffstat (limited to 'spec/javascripts/notes/stores')
-rw-r--r--spec/javascripts/notes/stores/mutation_spec.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/notes/stores/mutation_spec.js b/spec/javascripts/notes/stores/mutation_spec.js
index 9d652ba9f1e..380ab59099d 100644
--- a/spec/javascripts/notes/stores/mutation_spec.js
+++ b/spec/javascripts/notes/stores/mutation_spec.js
@@ -78,7 +78,7 @@ describe('Notes Store mutations', () => {
});
describe('COLLAPSE_DISCUSSION', () => {
- it('should collpase an expanded discussion', () => {
+ it('should collapse an expanded discussion', () => {
const discussion = Object.assign({}, discussionMock, { expanded: true });
const state = {