Merge branch 'patch-97' into 'master'

Remove `error` from UI

See merge request gitlab-org/gitlab!29281

app/assets/javascripts/notes/components/diff_with_note.vue

 <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

+---
+title: Remove 'error' from diff note error message
+merge_request: 29281
+author:
+type: fixed

locale/gitlab.pot

@@ -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 ""