diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 2f042ea64178e6850141c89b33c730e60e7dc60f..e931d95d38aededa43f4473056619ca5d609536f 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -279,7 +279,7 @@ def merge_request_header(project, merge_request) target_branch = link_to merge_request.target_branch, project_tree_path(merge_request.target_project, merge_request.target_branch), title: merge_request.target_branch, class: 'ref-container gl-display-inline-block gl-text-truncate gl-max-w-26 gl-mx-2' - _('%{author} requested to merge %{source_branch} %{copy_button} into %{target_branch} %{created_at}').html_safe % { author: link_to_author.html_safe, source_branch: merge_request_source_branch(merge_request).html_safe, copy_button: copy_button.html_safe, target_branch: target_branch.html_safe, created_at: time_ago_with_tooltip(merge_request.created_at, html_class: 'gl-display-inline-block').html_safe } + safe_format('%{author} • %{source_branch} %{copy_button} ➔ %{target_branch} %{created_at}', author: link_to_author, source_branch: merge_request_source_branch(merge_request), copy_button: copy_button, target_branch: target_branch, created_at: time_ago_with_tooltip(merge_request.created_at, html_class: 'gl-display-inline-block')) end def sticky_header_data diff --git a/app/views/projects/merge_requests/_code_dropdown.html.haml b/app/views/projects/merge_requests/_code_dropdown.html.haml index bfa33f264530510cdedf111a7198d8f71b6fc446..50f4e313bc59770127eff8d66595b048beadc8f0 100644 --- a/app/views/projects/merge_requests/_code_dropdown.html.haml +++ b/app/views/projects/merge_requests/_code_dropdown.html.haml @@ -1,6 +1,6 @@ .gl-md-ml-3.dropdown.gl-dropdown{ class: "gl-display-none! gl-md-display-flex!" } #js-check-out-modal{ data: how_merge_modal_data(@merge_request) } - = button_tag type: 'button', class: "btn dropdown-toggle btn-confirm gl-button gl-dropdown-toggle", data: { toggle: 'dropdown', testid: 'mr-code-dropdown' } do + = button_tag type: 'button', class: "btn dropdown-toggle btn-confirm-secondary gl-button gl-dropdown-toggle", data: { toggle: 'dropdown', testid: 'mr-code-dropdown' } do %span.gl-dropdown-button-text= _('Code') = sprite_icon "chevron-down", size: 16, css_class: "dropdown-icon gl-icon gl-ml-2 gl-mr-0!" .dropdown-menu.dropdown-menu-right diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 677370f7f0df393499d321a86eb25c70a4852052..7f80e5249ca114de417d18072ef90c22ae5739b7 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -550,9 +550,6 @@ msgstr "" msgid "%{author} has added you as an approver." msgstr "" -msgid "%{author} requested to merge %{source_branch} %{copy_button} into %{target_branch} %{created_at}" -msgstr "" - msgid "%{board_target} not found" msgstr "" diff --git a/spec/features/merge_request/user_creates_merge_request_spec.rb b/spec/features/merge_request/user_creates_merge_request_spec.rb index eab5cee976e69f74cfab23f9dc94d264b875072c..fdc996ef39b9a0592357226779503b3f12887990 100644 --- a/spec/features/merge_request/user_creates_merge_request_spec.rb +++ b/spec/features/merge_request/user_creates_merge_request_spec.rb @@ -98,7 +98,7 @@ click_button('Create merge request') - expect(page).to have_content(title).and have_content("requested to merge #{forked_project.full_path}:fix into master") + expect(page).to have_content(title).and have_content("• #{forked_project.full_path}:fix ➔ master") end end end diff --git a/spec/features/merge_request/user_edits_merge_request_spec.rb b/spec/features/merge_request/user_edits_merge_request_spec.rb index 584a17ae33d6adb5c23fa8bd76d62bfa4f5b3214..31b382be6112f677d3593cf1a581de96519c5430 100644 --- a/spec/features/merge_request/user_edits_merge_request_spec.rb +++ b/spec/features/merge_request/user_edits_merge_request_spec.rb @@ -95,7 +95,7 @@ click_button('Save changes') - expect(page).to have_content("requested to merge #{merge_request.source_branch} into merge-test") + expect(page).to have_content("• #{merge_request.source_branch} ➔ merge-test") expect(page).to have_content("changed target branch from #{merge_request.target_branch} to merge-test") end