diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-04-24 12:19:15 -0300 |
|---|---|---|
| committer | Nathan Friend <nathan@gitlab.com> | 2019-04-24 12:19:15 -0300 |
| commit | ca6e946f0f50d997ecad7d3758fe362cf0fae5ce (patch) | |
| tree | 37aac79b0d87304d22a4dea23a90567b09d6da51 /app | |
| parent | 951ffd9ddeeb6154a5929849f9b2f4c92c24c2a4 (diff) | |
| download | gitlab-ce-ca6e946f0f50d997ecad7d3758fe362cf0fae5ce.tar.gz | |
Only show message when MR is open60808-only-show-target-branch-advanced-error-before-merge
This commit fixes the bug that was causing the "target branch has
"advanced" error message to display after an MR was closed.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 3 |
1 files changed, 2 insertions, 1 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 aa4ecb0aac3..705ee05e29f 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 @@ -119,7 +119,8 @@ export default { }, showTargetBranchAdvancedError() { return Boolean( - this.mr.pipeline && + this.mr.isOpen && + this.mr.pipeline && this.mr.pipeline.target_sha && this.mr.pipeline.target_sha !== this.mr.targetBranchSha, ); |