Commit 2c548d72 authored by Phil Hughes's avatar Phil Hughes

Merge branch '32230-reorder-diffs-compare-versions-dropdowns' into 'master'

Reorder diffs compare versions dropdowns

Closes #32230

See merge request gitlab-org/gitlab!31770
parents e970635c 2aa39613
...@@ -98,20 +98,20 @@ export default { ...@@ -98,20 +98,20 @@ export default {
<gl-sprintf <gl-sprintf
v-if="showDropdowns" v-if="showDropdowns"
class="d-flex align-items-center compare-versions-container" class="d-flex align-items-center compare-versions-container"
:message="s__('MergeRequest|Compare %{source} and %{target}')" :message="s__('MergeRequest|Compare %{target} and %{source}')"
> >
<template #source>
<compare-dropdown-layout
:versions="diffCompareDropdownSourceVersions"
class="mr-version-dropdown"
/>
</template>
<template #target> <template #target>
<compare-dropdown-layout <compare-dropdown-layout
:versions="diffCompareDropdownTargetVersions" :versions="diffCompareDropdownTargetVersions"
class="mr-version-compare-dropdown" class="mr-version-compare-dropdown"
/> />
</template> </template>
<template #source>
<compare-dropdown-layout
:versions="diffCompareDropdownSourceVersions"
class="mr-version-dropdown"
/>
</template>
</gl-sprintf> </gl-sprintf>
<div v-else-if="commit"> <div v-else-if="commit">
{{ __('Viewing commit') }} {{ __('Viewing commit') }}
......
---
title: Reorder diffs compare versions dropdowns.
merge_request: 31770
author: Gilang Gumilar
type: changed
...@@ -13622,7 +13622,7 @@ msgstr "" ...@@ -13622,7 +13622,7 @@ msgstr ""
msgid "MergeRequests|started a thread on commit %{linkStart}%{commitDisplay}%{linkEnd}" msgid "MergeRequests|started a thread on commit %{linkStart}%{commitDisplay}%{linkEnd}"
msgstr "" msgstr ""
msgid "MergeRequest|Compare %{source} and %{target}" msgid "MergeRequest|Compare %{target} and %{source}"
msgstr "" msgstr ""
msgid "MergeRequest|Error dismissing suggestion popover. Please try again." msgid "MergeRequest|Error dismissing suggestion popover. Please try again."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment