diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-26 08:30:59 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-26 08:30:59 +0000 |
| commit | d1ac44ae96468c571ba153cd79d1760c78524894 (patch) | |
| tree | fae9d2886545ac82a0a3aff9a4ab7295ec226f4c /app | |
| parent | c1d93721e04f37d0cf188fe4c1c9cd1eeb482b07 (diff) | |
| parent | ca6e946f0f50d997ecad7d3758fe362cf0fae5ce (diff) | |
| download | gitlab-ce-d1ac44ae96468c571ba153cd79d1760c78524894.tar.gz | |
Merge branch '60808-only-show-target-branch-advanced-error-before-merge' into 'master'
Don't show the "target branch advanced" error message after merge
Closes #60808
See merge request gitlab-org/gitlab-ce!27588
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, ); |