diff options
| author | Phil Hughes <me@iamphill.com> | 2017-11-15 09:00:27 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-11-15 09:00:27 +0000 |
| commit | 068f9df2bdf8b758360dbb81a449986b2636bc3b (patch) | |
| tree | a60dd4c380535cacfec7f65c784a780c36598b54 /app | |
| parent | 8ee3ea74f58e0b1e463aa8828efae0206904b380 (diff) | |
| parent | 81862c2de1b26ab616b9eb27d0dd9b034483804d (diff) | |
| download | gitlab-ce-068f9df2bdf8b758360dbb81a449986b2636bc3b.tar.gz | |
Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' into 'master'
Remove approvals when in empty MR widget state -- CE backport
See merge request gitlab-org/gitlab-ce!15362
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js index f82938aa8a9..1274db2c4c8 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js @@ -61,7 +61,7 @@ export default { return this.mr.hasCI; }, shouldRenderRelatedLinks() { - return this.mr.relatedLinks; + return !!this.mr.relatedLinks; }, shouldRenderDeployments() { return this.mr.deployments.length; |