diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-13 21:08:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-13 21:08:33 +0300 |
| commit | 9adada1187b920547a57b4bb406c3e3c55436bf1 (patch) | |
| tree | 6c246b5f6acd81f24071f654a41df5081d671df1 /app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | |
| parent | 7eca3f56625526ffa7f263c1fef0fcea34de8ca6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 8b4f13b4f92..88f178b4dd0 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -165,11 +165,9 @@ export default { return this.mr?.codequalityReportsPath; }, shouldRenderRelatedLinks() { - const showDivergedCounts = - this.mr.divergedCommitsCount > 0 && this.mr.state !== 'readyToMerge'; - return ( - (Boolean(this.mr.relatedLinks) || showDivergedCounts) && !this.mr.isNothingToMergeState + (Boolean(this.mr.relatedLinks) || this.mr.divergedCommitsCount > 0) && + !this.mr.isNothingToMergeState ); }, shouldRenderSourceBranchRemovalStatus() { |