Commit b1321ded authored by Fatih Acet's avatar Fatih Acet

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

Fix typo in js (props, specs)

See merge request gitlab-org/gitlab-ce!23103
parents 4916de75 ccd1d682
...@@ -112,7 +112,7 @@ const JumpToDiscussion = Vue.extend({ ...@@ -112,7 +112,7 @@ const JumpToDiscussion = Vue.extend({
if (!hasDiscussionsToJumpTo) { if (!hasDiscussionsToJumpTo) {
// If there are no discussions to jump to on the current page, // 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'); window.mrTabs.activateTab('show');
activeTab = 'show'; activeTab = 'show';
jumpToFirstDiscussion = true; jumpToFirstDiscussion = true;
......
...@@ -23,7 +23,7 @@ export const diffHasAllExpandedDiscussions = (state, getters) => diff => { ...@@ -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 * @param {Object} diff
* @returns {Boolean} * @returns {Boolean}
*/ */
......
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
}, },
output: { output: {
type: Object, type: Object,
requred: true, required: true,
default: () => ({}), default: () => ({}),
}, },
}, },
......
---
title: Fix typo in notebook props
merge_request: 23103
author: George Tsiolis
type: other
...@@ -18,7 +18,7 @@ describe('expand button', () => { ...@@ -18,7 +18,7 @@ describe('expand button', () => {
vm.$destroy(); vm.$destroy();
}); });
it('renders a collpased button', () => { it('renders a collapsed button', () => {
expect(vm.$children[0].iconTestClass).toEqual('ic-ellipsis_h'); expect(vm.$children[0].iconTestClass).toEqual('ic-ellipsis_h');
}); });
......
...@@ -2556,7 +2556,7 @@ ...@@ -2556,7 +2556,7 @@
"merge_request_diff_id": 27, "merge_request_diff_id": 27,
"relative_order": 0, "relative_order": 0,
"sha": "bb5206fee213d983da88c47f9cf4cc6caf9c66dc", "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", "authored_date": "2014-08-06T08:35:52.000+02:00",
"author_name": "Dmitriy Zaporozhets", "author_name": "Dmitriy Zaporozhets",
"author_email": "dmitriy.zaporozhets@gmail.com", "author_email": "dmitriy.zaporozhets@gmail.com",
...@@ -3605,7 +3605,7 @@ ...@@ -3605,7 +3605,7 @@
"merge_request_diff_id": 14, "merge_request_diff_id": 14,
"relative_order": 8, "relative_order": 8,
"sha": "08f22f255f082689c0d7d39d19205085311542bc", "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", "authored_date": "2015-11-13T06:00:16.000+01:00",
"author_name": "윤민식", "author_name": "윤민식",
"author_email": "minsik.yoon@samsung.com", "author_email": "minsik.yoon@samsung.com",
...@@ -4290,7 +4290,7 @@ ...@@ -4290,7 +4290,7 @@
"merge_request_diff_id": 13, "merge_request_diff_id": 13,
"relative_order": 8, "relative_order": 8,
"sha": "08f22f255f082689c0d7d39d19205085311542bc", "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", "authored_date": "2015-11-13T06:00:16.000+01:00",
"author_name": "윤민식", "author_name": "윤민식",
"author_email": "minsik.yoon@samsung.com", "author_email": "minsik.yoon@samsung.com",
...@@ -4799,7 +4799,7 @@ ...@@ -4799,7 +4799,7 @@
"merge_request_diff_id": 12, "merge_request_diff_id": 12,
"relative_order": 8, "relative_order": 8,
"sha": "08f22f255f082689c0d7d39d19205085311542bc", "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", "authored_date": "2015-11-13T06:00:16.000+01:00",
"author_name": "윤민식", "author_name": "윤민식",
"author_email": "minsik.yoon@samsung.com", "author_email": "minsik.yoon@samsung.com",
...@@ -5507,7 +5507,7 @@ ...@@ -5507,7 +5507,7 @@
"merge_request_diff_id": 10, "merge_request_diff_id": 10,
"relative_order": 8, "relative_order": 8,
"sha": "08f22f255f082689c0d7d39d19205085311542bc", "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", "authored_date": "2015-11-13T06:00:16.000+01:00",
"author_name": "윤민식", "author_name": "윤민식",
"author_email": "minsik.yoon@samsung.com", "author_email": "minsik.yoon@samsung.com",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment