Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-04-03 11:05:52 +0300
committerFilipa Lacerda <filipa@gitlab.com>2019-04-03 11:05:52 +0300
commita374d690e702f26036f38bf375ceb2a5cfa3fe23 (patch)
tree09a9e81a05404c905af37d2df87a000908ad4313 /app
parent16a935f28f5d9a69d0cd310d1ef035d82ee4b575 (diff)
parenteebf24ead51a28863126f0b144e4fcdc5a6b2916 (diff)
Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'
Fixes duplicate diff too large error messages Closes #59802 See merge request gitlab-org/gitlab-ce!26857
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/diffs/components/diff_file.vue4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index 58a9605c181..f5876a73eff 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -188,10 +188,6 @@ export default {
/>
</div>
</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>
</template>