Skip to content
Snippets Groups Projects

File collapse: fix spelling and phrasing in UI text

Merged Amy Qualls requested to merge 391777-aqualls-fix-string into master
All threads resolved!
3 files
+ 13
3
Compare changes
  • Side-by-side
  • Inline
Files
3
<script>
import { GlButton, GlLoadingIcon, GlSprintf, GlAlert } from '@gitlab/ui';
import { GlButton, GlLoadingIcon, GlSprintf, GlAlert, GlLink } from '@gitlab/ui';
import { escape } from 'lodash';
// eslint-disable-next-line no-restricted-imports
import { mapActions, mapGetters, mapState } from 'vuex';
@@ -8,6 +8,7 @@ import { IdState } from 'vendor/vue-virtual-scroller';
import DiffContent from 'jh_else_ce/diffs/components/diff_content.vue';
import { createAlert } from '~/alert';
import { hasDiff } from '~/helpers/diffs_helper';
import { helpPagePath } from '~/helpers/help_page_helper';
import { diffViewerErrors } from '~/ide/constants';
import { scrollToElement, isElementStuck } from '~/lib/utils/common_utils';
import { sprintf } from '~/locale';
@@ -39,6 +40,7 @@ export default {
GlLoadingIcon,
GlSprintf,
GlAlert,
GlLink,
DiffFileDrafts,
NoteForm,
DiffDiscussions,
@@ -376,6 +378,9 @@ export default {
},
CONFLICT_TEXT,
FILE_DIFF_POSITION_TYPE,
generatedDiffFileDocsPath: helpPagePath('user/project/merge_requests/changes.html', {
anchor: 'collapse-generated-files',
}),
};
</script>
@@ -539,6 +544,11 @@ export default {
<template #tag="{ content }">
<code>{{ content }}</code>
</template>
<template #link="{ content }">
<gl-link :href="$options.generatedDiffFileDocsPath" target="_blank">{{
content
}}</gl-link>
</template>
</gl-sprintf>
</p>
<gl-button data-testid="expand-button" @click.prevent="handleToggle">
Loading