diff options
author | Mike Greiling <mike@pixelcog.com> | 2019-04-03 18:42:31 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2019-04-03 18:42:31 +0000 |
commit | 6202820c169ce1f1c5887a1e792455808a11401a (patch) | |
tree | afb7a0f4943448fae9be5c8a1c92a0ae03c7b07f /app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue | |
parent | 14bbc9362af374b7387a475821db5738b9032eb0 (diff) | |
parent | 4e5fc1949fb86eed92f7af6a2d98b55286d9b0b4 (diff) | |
download | gitlab-ce-59323-legend-showing-nan-for-avg-max-when-they-are-fractional-quantities.tar.gz |
Merge branch '29249-show-download-diff-even-when-merge-request-is-closed' into 'master'59323-legend-showing-nan-for-avg-max-when-they-are-fractional-quantities
Resolve "Show download diff even when merge request is closed"
Closes #29249
See merge request gitlab-org/gitlab-ce!26772
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue index 50ab7ead582..361441640e1 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue @@ -109,29 +109,31 @@ export default { ></div> </div> - <div v-if="mr.isOpen" class="branch-actions d-flex"> - <a - v-if="!mr.sourceBranchRemoved" - v-tooltip - :href="webIdePath" - :title="ideButtonTitle" - :class="{ disabled: !mr.canPushToSourceBranch }" - class="btn btn-default js-web-ide d-none d-md-inline-block append-right-8" - data-placement="bottom" - tabindex="0" - role="button" - > - {{ s__('mrWidget|Open in Web IDE') }} - </a> - <button - :disabled="mr.sourceBranchRemoved" - data-target="#modal_merge_info" - data-toggle="modal" - class="btn btn-default js-check-out-branch append-right-default" - type="button" - > - {{ s__('mrWidget|Check out branch') }} - </button> + <div class="branch-actions d-flex"> + <template v-if="mr.isOpen"> + <a + v-if="!mr.sourceBranchRemoved" + v-tooltip + :href="webIdePath" + :title="ideButtonTitle" + :class="{ disabled: !mr.canPushToSourceBranch }" + class="btn btn-default js-web-ide d-none d-md-inline-block append-right-8" + data-placement="bottom" + tabindex="0" + role="button" + > + {{ s__('mrWidget|Open in Web IDE') }} + </a> + <button + :disabled="mr.sourceBranchRemoved" + data-target="#modal_merge_info" + data-toggle="modal" + class="btn btn-default js-check-out-branch append-right-default" + type="button" + > + {{ s__('mrWidget|Check out branch') }} + </button> + </template> <span class="dropdown"> <button type="button" |