From 02bcb6b7119b33957fd567cc5b2f455d4a4e3c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20Lui=CC=81s?= Date: Tue, 18 Aug 2020 20:42:02 +0100 Subject: [PATCH 1/2] Make approval rule paths break line when needed --- .../components/approvals/approvals_list.vue | 2 +- .../238418-fix-approval-rules-bursting-layout.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 ee/changelogs/unreleased/238418-fix-approval-rules-bursting-layout.yml diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue index 8f060c24aa2049..0b4e5d8b65fea4 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue +++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue @@ -46,7 +46,7 @@ export default { rules: orderBy( this.approvalRules .filter(rule => rule.rule_type === RULE_TYPE_CODE_OWNER) - .map(rule => ({ ...rule, nameClass: 'monospace' })), + .map(rule => ({ ...rule, nameClass: 'monospace gl-word-break-all' })), [o => o.section === 'codeowners', 'name', 'section'], ['desc', 'asc', 'asc'], ), diff --git a/ee/changelogs/unreleased/238418-fix-approval-rules-bursting-layout.yml b/ee/changelogs/unreleased/238418-fix-approval-rules-bursting-layout.yml new file mode 100644 index 00000000000000..a0f636eb3ae73d --- /dev/null +++ b/ee/changelogs/unreleased/238418-fix-approval-rules-bursting-layout.yml @@ -0,0 +1,6 @@ +--- +title: Fix Approval Rules table in Merge Requests brusting out of the layout in some + scenarios +merge_request: 39753 +author: +type: fixed -- GitLab From b85df409a1b1d78c681bd00a264c0d3ba62445d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20Lui=CC=81s?= Date: Thu, 20 Aug 2020 13:06:06 +0100 Subject: [PATCH 2/2] Use gl-font-monospace and fix typo in changelog --- .../components/approvals/approvals_list.vue | 2 +- .../unreleased/238418-fix-approval-rules-bursting-layout.yml | 2 +- .../features/merge_request/user_sees_approval_widget_spec.rb | 4 ++-- .../vue_mr_widget/components/approvals/approvals_list_spec.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue index 0b4e5d8b65fea4..e05d7536cd7386 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue +++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue @@ -46,7 +46,7 @@ export default { rules: orderBy( this.approvalRules .filter(rule => rule.rule_type === RULE_TYPE_CODE_OWNER) - .map(rule => ({ ...rule, nameClass: 'monospace gl-word-break-all' })), + .map(rule => ({ ...rule, nameClass: 'gl-font-monospace gl-word-break-all' })), [o => o.section === 'codeowners', 'name', 'section'], ['desc', 'asc', 'asc'], ), diff --git a/ee/changelogs/unreleased/238418-fix-approval-rules-bursting-layout.yml b/ee/changelogs/unreleased/238418-fix-approval-rules-bursting-layout.yml index a0f636eb3ae73d..646ea549860fb6 100644 --- a/ee/changelogs/unreleased/238418-fix-approval-rules-bursting-layout.yml +++ b/ee/changelogs/unreleased/238418-fix-approval-rules-bursting-layout.yml @@ -1,5 +1,5 @@ --- -title: Fix Approval Rules table in Merge Requests brusting out of the layout in some +title: Fix Approval Rules table in Merge Requests bursting out of the layout in some scenarios merge_request: 39753 author: diff --git a/ee/spec/features/merge_request/user_sees_approval_widget_spec.rb b/ee/spec/features/merge_request/user_sees_approval_widget_spec.rb index 975403ffb256d6..61ed003f174ec7 100644 --- a/ee/spec/features/merge_request/user_sees_approval_widget_spec.rb +++ b/ee/spec/features/merge_request/user_sees_approval_widget_spec.rb @@ -99,7 +99,7 @@ click_on 'View eligible approvers' wait_for_requests - within('.mr-widget-workflow table .monospace') do + within('.mr-widget-workflow table .gl-font-monospace') do code_owner_row = find(:xpath, "//tr[td[contains(.,'#{code_owner_rule.name}')]]") expect(code_owner_row).to have_content('Optional') @@ -123,7 +123,7 @@ click_on 'View eligible approvers' wait_for_requests - within('.mr-widget-workflow table .monospace') do + within('.mr-widget-workflow table .gl-font-monospace') do code_owner_row = find(:xpath, "//tr[td[contains(.,'#{code_owner_rule.name}')]]") expect(code_owner_row).to have_content('0 of 1') diff --git a/ee/spec/frontend/vue_mr_widget/components/approvals/approvals_list_spec.js b/ee/spec/frontend/vue_mr_widget/components/approvals/approvals_list_spec.js index ed40052de03e64..5f2ef979065769 100644 --- a/ee/spec/frontend/vue_mr_widget/components/approvals/approvals_list_spec.js +++ b/ee/spec/frontend/vue_mr_widget/components/approvals/approvals_list_spec.js @@ -350,7 +350,7 @@ describe('EE MRWidget approvals list', () => { it('renders the name in a monospace font', () => { const codeOwnerRow = findRowElement(row, 'name'); - expect(codeOwnerRow.find('.monospace').exists()).toEqual(true); + expect(codeOwnerRow.find('.gl-font-monospace').exists()).toEqual(true); expect(codeOwnerRow.text()).toContain(rule.name); }); -- GitLab