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
aebfe400
Commit
aebfe400
authored
Apr 14, 2020
by
Mark Florian
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'patch-97' into 'master'
Remove `error` from UI See merge request gitlab-org/gitlab!29281
parents
b6043f99
287d6bb5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
app/assets/javascripts/notes/components/diff_with_note.vue
app/assets/javascripts/notes/components/diff_with_note.vue
+1
-2
changelogs/unreleased/patch-97.yml
changelogs/unreleased/patch-97.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/assets/javascripts/notes/components/diff_with_note.vue
View file @
aebfe400
<
script
>
/* eslint-disable @gitlab/vue-require-i18n-strings */
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
GlSkeletonLoading
}
from
'
@gitlab/ui
'
;
import
DiffFileHeader
from
'
~/diffs/components/diff_file_header.vue
'
;
...
...
@@ -96,7 +95,7 @@ export default {
<td
class=
"old_line diff-line-num"
></td>
<td
class=
"new_line diff-line-num"
></td>
<td
v-if=
"error"
class=
"js-error-lazy-load-diff diff-loading-error-block"
>
{{
error }} Unable to load the diff
{{
__('Unable to load the diff') }}
<button
class=
"btn-link btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button"
@
click=
"fetchDiff"
...
...
changelogs/unreleased/patch-97.yml
0 → 100644
View file @
aebfe400
---
title
:
Remove 'error' from diff note error message
merge_request
:
29281
author
:
type
:
fixed
locale/gitlab.pot
View file @
aebfe400
...
...
@@ -21814,6 +21814,9 @@ msgstr ""
msgid "Unable to generate new instance ID"
msgstr ""
msgid "Unable to load the diff"
msgstr ""
msgid "Unable to load the diff. %{button_try_again}"
msgstr ""
...
...
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