diff options
Diffstat (limited to 'app/assets/javascripts/issuable')
3 files changed, 9 insertions, 11 deletions
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 d46354e240a..8a55176fed0 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 @@ -54,24 +54,23 @@ export default class IssuableBulkUpdateSidebar { new MilestoneSelect(); subscriptionSelect(); + // Checking IS_EE and using ee_else_ce is odd, but we do it here to satisfy + // the import/no-unresolved lint rule when FOSS_ONLY=1, even though at + // runtime this block won't execute. if (IS_EE) { - import('ee/vue_shared/components/sidebar/health_status_select/health_status_bundle') + import('ee_else_ce/vue_shared/components/sidebar/health_status_select/health_status_bundle') .then(({ default: HealthStatusSelect }) => { HealthStatusSelect(); }) .catch(() => {}); - } - if (IS_EE) { - import('ee/vue_shared/components/sidebar/epics_select/epics_select_bundle') + import('ee_else_ce/vue_shared/components/sidebar/epics_select/epics_select_bundle') .then(({ default: EpicSelect }) => { EpicSelect(); }) .catch(() => {}); - } - if (IS_EE) { - import('ee/vue_shared/components/sidebar/iterations_dropdown_bundle') + import('ee_else_ce/vue_shared/components/sidebar/iterations_dropdown_bundle') .then(({ default: iterationsDropdown }) => { iterationsDropdown(); }) diff --git a/app/assets/javascripts/issuable/components/related_issuable_item.vue b/app/assets/javascripts/issuable/components/related_issuable_item.vue index e6379b35f7a..a505a988360 100644 --- a/app/assets/javascripts/issuable/components/related_issuable_item.vue +++ b/app/assets/javascripts/issuable/components/related_issuable_item.vue @@ -84,7 +84,7 @@ export default { <gl-icon v-if="hasState" ref="iconElementXL" - class="mr-2 d-block" + class="gl-mr-3" :class="iconClasses" :name="iconName" :title="stateTitle" diff --git a/app/assets/javascripts/issuable/issuable_form.js b/app/assets/javascripts/issuable/issuable_form.js index 38453072af8..cc2608b5c62 100644 --- a/app/assets/javascripts/issuable/issuable_form.js +++ b/app/assets/javascripts/issuable/issuable_form.js @@ -68,8 +68,7 @@ export default class IssuableForm { this.gfmAutoComplete = new GfmAutoComplete( gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources, ).setup(); - const autoAssignToMe = form.get(0).id === 'new_merge_request'; - this.usersSelect = new UsersSelect(undefined, undefined, { autoAssignToMe }); + this.usersSelect = new UsersSelect(); this.reviewersSelect = new UsersSelect(undefined, '.js-reviewer-search'); this.zenMode = new ZenMode(); @@ -82,7 +81,7 @@ export default class IssuableForm { this.initAutosave(); this.form.on('submit', this.handleSubmit); - this.form.on('click', '.btn-cancel', this.resetAutosave); + this.form.on('click', '.btn-cancel, .js-reset-autosave', this.resetAutosave); this.form.find('.js-unwrap-on-load').unwrap(); this.initWip(); |