diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-10 01:15:56 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-16 11:52:35 -0500 |
| commit | 4d0db16f9712f0adbe36b992c28f9d2ec20c301e (patch) | |
| tree | c0c3c08297c18a5fd374c4e79082aa6947b7f8ed /app/assets/javascripts/diffs | |
| parent | 7fd4e21c77efeed91de330f57f325feca0a8dfba (diff) | |
| download | gitlab-ce-4d0db16f9712f0adbe36b992c28f9d2ec20c301e.tar.gz | |
Prettify diff_notes diffs and droplab modules
Diffstat (limited to 'app/assets/javascripts/diffs')
| -rw-r--r-- | app/assets/javascripts/diffs/components/commit_item.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue index 993206b2e73..23d0bad2ecb 100644 --- a/app/assets/javascripts/diffs/components/commit_item.vue +++ b/app/assets/javascripts/diffs/components/commit_item.vue @@ -43,7 +43,9 @@ export default { return (this.commit.author && this.commit.author.name) || this.commit.authorName; }, authorUrl() { - return (this.commit.author && this.commit.author.webUrl) || `mailto:${this.commit.authorEmail}`; + return ( + (this.commit.author && this.commit.author.webUrl) || `mailto:${this.commit.authorEmail}` + ); }, authorAvatar() { return (this.commit.author && this.commit.author.avatarUrl) || this.commit.authorGravatarUrl; diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 4e04e50c52a..f72c7a84e5c 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -46,10 +46,10 @@ export default { showExpandMessage() { return ( this.isCollapsed || - !this.file.highlightedDiffLines && - !this.isLoadingCollapsedDiff && - !this.file.tooLarge && - this.file.text + (!this.file.highlightedDiffLines && + !this.isLoadingCollapsedDiff && + !this.file.tooLarge && + this.file.text) ); }, showLoadingIcon() { |