Commit eebf24ea authored by Phil Hughes's avatar Phil Hughes

Fixes duplicate diff too large error messages

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
parent ee89d955
...@@ -188,10 +188,6 @@ export default { ...@@ -188,10 +188,6 @@ export default {
/> />
</div> </div>
</template> </template>
<div v-if="isFileTooLarge" class="nothing-here-block diff-collapsed js-too-large-diff">
{{ __('This source diff could not be displayed because it is too large.') }}
<span v-html="viewBlobLink"></span>
</div>
</div> </div>
</template> </template>
......
---
title: Fixed duplicated diff too large error message
merge_request:
author:
type: fixed
...@@ -8278,9 +8278,6 @@ msgstr "" ...@@ -8278,9 +8278,6 @@ msgstr ""
msgid "This setting will update the hostname that is used to generate private commit emails. %{learn_more}" msgid "This setting will update the hostname that is used to generate private commit emails. %{learn_more}"
msgstr "" msgstr ""
msgid "This source diff could not be displayed because it is too large."
msgstr ""
msgid "This timeout will take precedence when lower than project-defined timeout and accepts a human readable time input language like \"1 hour\". Values without specification represent seconds." msgid "This timeout will take precedence when lower than project-defined timeout and accepts a human readable time input language like \"1 hour\". Values without specification represent seconds."
msgstr "" msgstr ""
......
...@@ -141,18 +141,16 @@ describe('DiffFile', () => { ...@@ -141,18 +141,16 @@ describe('DiffFile', () => {
it('should have too large warning and blob link', done => { it('should have too large warning and blob link', done => {
const BLOB_LINK = '/file/view/path'; const BLOB_LINK = '/file/view/path';
vm.file.viewer.error = diffViewerErrors.too_large; vm.file.viewer.error = diffViewerErrors.too_large;
vm.file.viewer.error_message =
'This source diff could not be displayed because it is too large';
vm.file.view_path = BLOB_LINK; vm.file.view_path = BLOB_LINK;
vm.file.renderIt = true;
vm.$nextTick(() => { vm.$nextTick(() => {
expect(vm.$el.innerText).toContain( expect(vm.$el.innerText).toContain(
'This source diff could not be displayed because it is too large', 'This source diff could not be displayed because it is too large',
); );
expect(vm.$el.querySelector('.js-too-large-diff')).toBeDefined();
expect(
vm.$el.querySelector('.js-too-large-diff a').href.indexOf(BLOB_LINK),
).toBeGreaterThan(-1);
done(); done();
}); });
}); });
......
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