diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-13 21:15:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-13 21:15:18 +0300 |
commit | 999cc13e0a77fad7322fbbe559013565355c2bfb (patch) | |
tree | cda92e5b004f6e4527f91acb1d24f228880a4526 /app/assets/javascripts/issuable | |
parent | aacba12c6e9817b552989de77b54e89b7c863b85 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issuable')
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/issuable/bulk_update_sidebar/issuable_bulk_update_actions.js b/app/assets/javascripts/issuable/bulk_update_sidebar/issuable_bulk_update_actions.js index 463e0e5837e..14824820c0d 100644 --- a/app/assets/javascripts/issuable/bulk_update_sidebar/issuable_bulk_update_actions.js +++ b/app/assets/javascripts/issuable/bulk_update_sidebar/issuable_bulk_update_actions.js @@ -115,7 +115,7 @@ export default { }); // Add uniqueIds to add it as argument for _.intersection labelIds.unshift(uniqueIds); - // Return IDs that are present but not in all selected issueables + // Return IDs that are present but not in all selected issuables return uniqueIds.filter((x) => !intersection.apply(this, labelIds).includes(x)); }, diff --git a/app/assets/javascripts/issuable/bulk_update_sidebar/issuable_bulk_update_sidebar.js b/app/assets/javascripts/issuable/bulk_update_sidebar/issuable_bulk_update_sidebar.js index 8f94f54dc78..1eb3ffc9808 100644 --- a/app/assets/javascripts/issuable/bulk_update_sidebar/issuable_bulk_update_sidebar.js +++ b/app/assets/javascripts/issuable/bulk_update_sidebar/issuable_bulk_update_sidebar.js @@ -3,7 +3,7 @@ import $ from 'jquery'; import { property } from 'lodash'; -import issueableEventHub from '~/issues_list/eventhub'; +import issuableEventHub from '~/issues_list/eventhub'; import LabelsSelect from '~/labels/labels_select'; import MilestoneSelect from '~/milestones/milestone_select'; import initIssueStatusSelect from './init_issue_status_select'; @@ -50,8 +50,8 @@ export default class IssuableBulkUpdateSidebar { // The event hub connects this bulk update logic with `issues_list_app.vue`. // We can remove it once we've refactored the issues list page bulk edit sidebar to Vue. // https://gitlab.com/gitlab-org/gitlab/-/issues/325874 - issueableEventHub.$on('issuables:enableBulkEdit', () => this.toggleBulkEdit(null, true)); - issueableEventHub.$on('issuables:updateBulkEdit', () => this.updateFormState()); + issuableEventHub.$on('issuables:enableBulkEdit', () => this.toggleBulkEdit(null, true)); + issuableEventHub.$on('issuables:updateBulkEdit', () => this.updateFormState()); } initDropdowns() { @@ -110,7 +110,7 @@ export default class IssuableBulkUpdateSidebar { toggleBulkEdit(e, enable) { e?.preventDefault(); - issueableEventHub.$emit('issuables:toggleBulkEdit', enable); + issuableEventHub.$emit('issuables:toggleBulkEdit', enable); this.toggleSidebarDisplay(enable); this.toggleBulkEditButtonDisabled(enable); diff --git a/app/assets/javascripts/issuable/index.js b/app/assets/javascripts/issuable/index.js index ad7c1942074..072422944f5 100644 --- a/app/assets/javascripts/issuable/index.js +++ b/app/assets/javascripts/issuable/index.js @@ -56,7 +56,7 @@ export function initCsvImportExportButtons() { export function initIssuableByEmail() { Vue.use(GlToast); - const el = document.querySelector('.js-issueable-by-email'); + const el = document.querySelector('.js-issuable-by-email'); if (!el) return null; |