Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2aa39613
Commit
2aa39613
authored
May 29, 2020
by
Gilang Gumilar
Committed by
Phil Hughes
May 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorder diffs compare versions dropdowns
parent
5b301327
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
app/assets/javascripts/diffs/components/compare_versions.vue
app/assets/javascripts/diffs/components/compare_versions.vue
+7
-7
changelogs/unreleased/32230-reorder-diffs-compare-versions-dropdowns.yml
...leased/32230-reorder-diffs-compare-versions-dropdowns.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
app/assets/javascripts/diffs/components/compare_versions.vue
View file @
2aa39613
...
...
@@ -98,20 +98,20 @@ export default {
<gl-sprintf
v-if=
"showDropdowns"
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
>
<compare-dropdown-layout
:versions=
"diffCompareDropdownTargetVersions"
class=
"mr-version-compare-dropdown"
/>
</
template
>
<
template
#source
>
<compare-dropdown-layout
:versions=
"diffCompareDropdownSourceVersions"
class=
"mr-version-dropdown"
/>
</
template
>
</gl-sprintf>
<div
v-else-if=
"commit"
>
{{ __('Viewing commit') }}
...
...
changelogs/unreleased/32230-reorder-diffs-compare-versions-dropdowns.yml
0 → 100644
View file @
2aa39613
---
title
:
Reorder diffs compare versions dropdowns.
merge_request
:
31770
author
:
Gilang Gumilar
type
:
changed
locale/gitlab.pot
View file @
2aa39613
...
...
@@ -13613,7 +13613,7 @@ msgstr ""
msgid "MergeRequests|started a thread on commit %{linkStart}%{commitDisplay}%{linkEnd}"
msgstr ""
msgid "MergeRequest|Compare %{
source} and %{target
}"
msgid "MergeRequest|Compare %{
target} and %{source
}"
msgstr ""
msgid "MergeRequest|Error dismissing suggestion popover. Please try again."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment