Commit d71f1b02 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'pb-fix-wrap-on-buttons' into 'master'

Revert action button change on pipelines table

See merge request gitlab-org/gitlab!68368
parents 7915f7e1 d01416c1
......@@ -87,21 +87,22 @@ export default {
@click="handleRetryClick"
/>
<gl-button
v-if="pipeline.flags.cancelable"
v-gl-tooltip.hover
v-gl-modal-directive="'confirmation-modal'"
:aria-label="$options.i18n.cancelTitle"
:title="$options.i18n.cancelTitle"
:loading="isCancelling"
:disabled="isCancelling"
icon="cancel"
variant="danger"
category="primary"
class="js-pipelines-cancel-button gl-ml-1"
@click="handleCancelClick"
/>
<pipeline-multi-actions :pipeline-id="pipeline.id" />
</div>
<gl-button
v-if="pipeline.flags.cancelable"
v-gl-tooltip.hover
v-gl-modal-directive="'confirmation-modal'"
:aria-label="$options.i18n.cancelTitle"
:title="$options.i18n.cancelTitle"
:loading="isCancelling"
:disabled="isCancelling"
icon="cancel"
variant="danger"
category="primary"
class="js-pipelines-cancel-button gl-ml-1"
@click="handleCancelClick"
/>
</div>
</template>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment