diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:45 +0300 |
| commit | aaf59610548d9b0fd01acfd50e831cbe519ecba2 (patch) | |
| tree | b6505abedcd965ebae5118b504b185b63129dc4c /app/assets/javascripts/vue_shared/components/sidebar | |
| parent | 1363ca12f1f07c634647cf55c4c16b7401098673 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/sidebar')
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue index 0e401a9f7aa..44cc11a6aaa 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue @@ -77,12 +77,12 @@ export default { }, enableScopedLabels: { type: Boolean, - require: false, + required: false, default: false, }, scopedLabelsDocumentationLink: { type: String, - require: false, + required: false, default: '#', }, }, diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue index 1eed8907bb7..c3bc61d0053 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue @@ -33,12 +33,12 @@ export default { }, enableScopedLabels: { type: Boolean, - require: false, + required: false, default: false, }, scopedLabelsDocumentationLink: { type: String, - require: false, + required: false, default: '#', }, }, diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js index 145ec7dc566..e6053628eca 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js @@ -45,7 +45,7 @@ export const createLabel = ({ state, dispatch }, label) => { dispatch('receiveCreateLabelSuccess'); dispatch('toggleDropdownContentsCreateView'); } else { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings throw new Error('Error Creating Label'); } }) |