diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 09:08:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 09:08:42 +0000 |
commit | f14507e586a7f75f0fb71a1d8468b7361be860d4 (patch) | |
tree | a8aa547b517a7ae5626c902bfb558c1fc5386c4e /app/assets/javascripts/helpers | |
parent | f4d27d532e3abeecd1caffeb3a56e698ae982e5b (diff) | |
download | gitlab-ce-f14507e586a7f75f0fb71a1d8468b7361be860d4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/helpers')
-rw-r--r-- | app/assets/javascripts/helpers/diffs_helper.js | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/assets/javascripts/helpers/diffs_helper.js b/app/assets/javascripts/helpers/diffs_helper.js index 9695d01ad3d..d2b8cb11fe0 100644 --- a/app/assets/javascripts/helpers/diffs_helper.js +++ b/app/assets/javascripts/helpers/diffs_helper.js @@ -1,9 +1,9 @@ export function hasInlineLines(diffFile) { - return diffFile?.highlighted_diff_lines?.length > 0; /* eslint-disable-line camelcase */ + return diffFile?.highlighted_diff_lines?.length > 0; } export function hasParallelLines(diffFile) { - return diffFile?.parallel_diff_lines?.length > 0; /* eslint-disable-line camelcase */ + return diffFile?.parallel_diff_lines?.length > 0; } export function isSingleViewStyle(diffFile) { @@ -11,9 +11,5 @@ export function isSingleViewStyle(diffFile) { } export function hasDiff(diffFile) { - return ( - hasInlineLines(diffFile) || - hasParallelLines(diffFile) || - !diffFile?.blob?.readable_text /* eslint-disable-line camelcase */ - ); + return hasInlineLines(diffFile) || hasParallelLines(diffFile) || !diffFile?.blob?.readable_text; } |