Merge branch 'gt-fix-typo-in-notebook-props' into 'master'

Fix typo in js (props, specs)

See merge request gitlab-org/gitlab-ce!23103

6 files changed, 14 insertions, 9 deletions

diff --git a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js
index c0c21416275..8542a6e718a 100644
--- a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js
+++ b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js
@@ -112,7 +112,7 @@ const JumpToDiscussion = Vue.extend({
 
       if (!hasDiscussionsToJumpTo) {
         // If there are no discussions to jump to on the current page,
-        // switch to the notes tab and jump to the first disucssion there.
+        // switch to the notes tab and jump to the first discussion there.
         window.mrTabs.activateTab('show');
         activeTab = 'show';
         jumpToFirstDiscussion = true;
diff --git a/app/assets/javascripts/diffs/store/getters.js b/app/assets/javascripts/diffs/store/getters.js
index 05e32e3c1f1..6a87b712b48 100644
--- a/app/assets/javascripts/diffs/store/getters.js
+++ b/app/assets/javascripts/diffs/store/getters.js
@@ -23,7 +23,7 @@ export const diffHasAllExpandedDiscussions = (state, getters) => diff => {
 };
 
 /**
- * Checks if the diff has all discussions collpased
+ * Checks if the diff has all discussions collapsed
  * @param {Object} diff
  * @returns {Boolean}
  */
diff --git a/app/assets/javascripts/notebook/cells/output/index.vue b/app/assets/javascripts/notebook/cells/output/index.vue
index d9f8604ed10..bd0bcc0d819 100644
--- a/app/assets/javascripts/notebook/cells/output/index.vue
+++ b/app/assets/javascripts/notebook/cells/output/index.vue
@@ -22,7 +22,7 @@ export default {
     },
     output: {
       type: Object,
-      requred: true,
+      required: true,
       default: () => ({}),
     },
   },
diff --git a/changelogs/unreleased/gt-fix-typo-in-notebook-props.yml b/changelogs/unreleased/gt-fix-typo-in-notebook-props.yml
new file mode 100644
index 00000000000..60603905a2d
--- /dev/null
+++ b/changelogs/unreleased/gt-fix-typo-in-notebook-props.yml
@@ -0,0 +1,5 @@
+---
+title: Fix typo in notebook props
+merge_request: 23103
+author: George Tsiolis
+type: other
diff --git a/spec/javascripts/vue_shared/components/expand_button_spec.js b/spec/javascripts/vue_shared/components/expand_button_spec.js
index 98fee9a74a5..2af4abc299a 100644
--- a/spec/javascripts/vue_shared/components/expand_button_spec.js
+++ b/spec/javascripts/vue_shared/components/expand_button_spec.js
@@ -18,7 +18,7 @@ describe('expand button', () => {
     vm.$destroy();
   });
 
-  it('renders a collpased button', () => {
+  it('renders a collapsed button', () => {
     expect(vm.$children[0].iconTestClass).toEqual('ic-ellipsis_h');
   });
 
diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json
index 3f2281f213f..58949f76bd6 100644
--- a/spec/lib/gitlab/import_export/project.json
+++ b/spec/lib/gitlab/import_export/project.json
@@ -2556,7 +2556,7 @@
             "merge_request_diff_id": 27,
             "relative_order": 0,
             "sha": "bb5206fee213d983da88c47f9cf4cc6caf9c66dc",
-            "message": "Feature conflcit added\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
+            "message": "Feature conflict added\n\nSigned-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>\n",
             "authored_date": "2014-08-06T08:35:52.000+02:00",
             "author_name": "Dmitriy Zaporozhets",
             "author_email": "dmitriy.zaporozhets@gmail.com",
@@ -3605,7 +3605,7 @@
             "merge_request_diff_id": 14,
             "relative_order": 8,
             "sha": "08f22f255f082689c0d7d39d19205085311542bc",
-            "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+            "message": "remove empty file.(beacase git ignore empty file)\nadd whitespace test file.\n",
             "authored_date": "2015-11-13T06:00:16.000+01:00",
             "author_name": "윤민식",
             "author_email": "minsik.yoon@samsung.com",
@@ -4290,7 +4290,7 @@
             "merge_request_diff_id": 13,
             "relative_order": 8,
             "sha": "08f22f255f082689c0d7d39d19205085311542bc",
-            "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+            "message": "remove empty file.(beacase git ignore empty file)\nadd whitespace test file.\n",
             "authored_date": "2015-11-13T06:00:16.000+01:00",
             "author_name": "윤민식",
             "author_email": "minsik.yoon@samsung.com",
@@ -4799,7 +4799,7 @@
             "merge_request_diff_id": 12,
             "relative_order": 8,
             "sha": "08f22f255f082689c0d7d39d19205085311542bc",
-            "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+            "message": "remove empty file.(beacase git ignore empty file)\nadd whitespace test file.\n",
             "authored_date": "2015-11-13T06:00:16.000+01:00",
             "author_name": "윤민식",
             "author_email": "minsik.yoon@samsung.com",
@@ -5507,7 +5507,7 @@
             "merge_request_diff_id": 10,
             "relative_order": 8,
             "sha": "08f22f255f082689c0d7d39d19205085311542bc",
-            "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+            "message": "remove empty file.(beacase git ignore empty file)\nadd whitespace test file.\n",
             "authored_date": "2015-11-13T06:00:16.000+01:00",
             "author_name": "윤민식",
             "author_email": "minsik.yoon@samsung.com",