Commit 3eb67d94 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'feature/jramsay/diff-expansion-copy' into 'master'

Improve diff expansion text

Closes #31906

See merge request gitlab-org/gitlab!21616
parents 566c284d 40e1ff47
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
<icon :size="12" name="expand-up" aria-hidden="true" /> <icon :size="12" name="expand-up" aria-hidden="true" />
</a> </a>
<a class="mx-2 cursor-pointer js-unfold-all" @click="handleExpandLines()"> <a class="mx-2 cursor-pointer js-unfold-all" @click="handleExpandLines()">
<span>{{ s__('Diffs|Show all lines') }}</span> <span>{{ s__('Diffs|Show unchanged lines') }}</span>
</a> </a>
<a <a
v-if="canExpandDown" v-if="canExpandDown"
......
---
title: Improve diff expansion text
merge_request: 21616
author:
type: other
...@@ -68,7 +68,7 @@ list. ...@@ -68,7 +68,7 @@ list.
By default, the diff shows only the parts of a file which are changed. By default, the diff shows only the parts of a file which are changed.
To view more unchanged lines above or below a change click on the To view more unchanged lines above or below a change click on the
**Expand up** or **Expand down** icons. You can also click on **Show all lines** **Expand up** or **Expand down** icons. You can also click on **Show unchanged lines**
to expand the entire file. to expand the entire file.
![Incrementally expand merge request diffs](img/incrementally_expand_merge_request_diffs_v12_2.png) ![Incrementally expand merge request diffs](img/incrementally_expand_merge_request_diffs_v12_2.png)
......
...@@ -5994,7 +5994,7 @@ msgstr "" ...@@ -5994,7 +5994,7 @@ msgstr ""
msgid "Diffs|No file name available" msgid "Diffs|No file name available"
msgstr "" msgstr ""
msgid "Diffs|Show all lines" msgid "Diffs|Show unchanged lines"
msgstr "" msgstr ""
msgid "Diffs|Something went wrong while fetching diff lines." msgid "Diffs|Something went wrong while fetching diff lines."
......
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