diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_jira_association_missing.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_jira_association_missing.vue deleted file mode 100644 index ac92617036a487debeb1c2ec2204d0f00e17a79b..0000000000000000000000000000000000000000 --- a/ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_jira_association_missing.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index a66fb5f3bcba6233b492d832bc7211bd93eca993..98f6bb55ddb5a1579d693e1e294bb7a588b6c27b 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -12,7 +12,6 @@ import MrWidgetAutoMergeEnabled from '~/vue_merge_request_widget/components/stat import MergeChecks from '~/vue_merge_request_widget/components/merge_checks.vue'; import ReadyToMerge from '~/vue_merge_request_widget/components/states/ready_to_merge.vue'; import Loading from '~/vue_merge_request_widget/components/loading.vue'; -import MrWidgetJiraAssociationMissing from './components/states/mr_widget_jira_association_missing.vue'; import MrWidgetPolicyViolation from './components/states/mr_widget_policy_violation.vue'; import MrWidgetGeoSecondaryNode from './components/states/mr_widget_secondary_geo_node.vue'; import WidgetContainer from './components/widget/app.vue'; @@ -24,7 +23,6 @@ export default { WidgetContainer, MrWidgetGeoSecondaryNode, MrWidgetPolicyViolation, - MrWidgetJiraAssociationMissing, MrWidgetAlertMessage, MrWidgetSuggestPipeline, MrWidgetMigrateJenkins, diff --git a/ee/spec/frontend/vue_merge_request_widget/components/states/mr_widget_jira_association_missing_spec.js b/ee/spec/frontend/vue_merge_request_widget/components/states/mr_widget_jira_association_missing_spec.js deleted file mode 100644 index d089e65a390256237e3b3c0a10ccbd6df783c9e8..0000000000000000000000000000000000000000 --- a/ee/spec/frontend/vue_merge_request_widget/components/states/mr_widget_jira_association_missing_spec.js +++ /dev/null @@ -1,31 +0,0 @@ -import { shallowMount } from '@vue/test-utils'; -import MrWidgetJiraAssociationMissing from 'ee/vue_merge_request_widget/components/states/mr_widget_jira_association_missing.vue'; -import StateContainer from '~/vue_merge_request_widget/components/state_container.vue'; -import BoldText from '~/vue_merge_request_widget/components/bold_text.vue'; - -describe('MrWidgetJiraAssociationMissing', () => { - let wrapper; - - beforeEach(() => { - wrapper = shallowMount(MrWidgetJiraAssociationMissing, { - propsData: { - mr: {}, - }, - stubs: { - BoldText: false, - GlSprintf: false, - }, - }); - }); - - it('shows failed status', () => { - expect(wrapper.findComponent(StateContainer).exists()).toBe(true); - expect(wrapper.findComponent(StateContainer).props().status).toBe('failed'); - }); - - it('shows the disabled reason', () => { - const message = wrapper.findComponent(BoldText).props('message'); - expect(message).toContain('Merge blocked:'); - expect(message).toContain('a Jira issue key must be mentioned in the title or description.'); - }); -}); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 2b8355bb17fcc3f03b4466443f9bbd2d671b6ac9..1e559ff4537546942d91b19a83b0ab2c4c93ea78 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -67923,9 +67923,6 @@ msgstr "" msgid "mrWidget|%{boldHeaderStart}Looks like there's no pipeline here.%{boldHeaderEnd}" msgstr "" -msgid "mrWidget|%{boldStart}Merge blocked:%{boldEnd} a Jira issue key must be mentioned in the title or description." -msgstr "" - msgid "mrWidget|%{boldStart}Merge blocked:%{boldEnd} denied licenses must be removed." msgstr ""