Commit 6d34ce73 authored by Phil Hughes's avatar Phil Hughes

Merge branch '55893-artifacts-download' into 'master'

Fixes dropdowns not working in Pipelines pages

Closes #55893 and #56071

See merge request gitlab-org/gitlab-ce!25043
parents bd488bc2 4da7be73
...@@ -59,17 +59,19 @@ export default { ...@@ -59,17 +59,19 @@ export default {
</script> </script>
<template> <template>
<div class="btn-group"> <div class="btn-group">
<gl-button <button
v-gl-tooltip v-gl-tooltip
type="button"
:disabled="isLoading" :disabled="isLoading"
class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions" class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions"
title="Manual job" :title="__('Manual job')"
data-toggle="dropdown" data-toggle="dropdown"
aria-label="Manual job" :aria-label="__('Manual job')"
> >
<icon name="play" class="icon-play" /> <i class="fa fa-caret-down" aria-hidden="true"> </i> <icon name="play" class="icon-play" />
<i class="fa fa-caret-down" aria-hidden="true"></i>
<gl-loading-icon v-if="isLoading" /> <gl-loading-icon v-if="isLoading" />
</gl-button> </button>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
<li v-for="action in actions" :key="action.path"> <li v-for="action in actions" :key="action.path">
......
<script> <script>
import { GlLink, GlButton, GlTooltipDirective } from '@gitlab/ui'; import { GlLink, GlTooltipDirective } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
export default { export default {
...@@ -9,7 +9,6 @@ export default { ...@@ -9,7 +9,6 @@ export default {
components: { components: {
Icon, Icon,
GlLink, GlLink,
GlButton,
}, },
props: { props: {
artifacts: { artifacts: {
...@@ -21,20 +20,22 @@ export default { ...@@ -21,20 +20,22 @@ export default {
</script> </script>
<template> <template>
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<gl-button <button
v-gl-tooltip v-gl-tooltip
class="dropdown-toggle build-artifacts js-pipeline-dropdown-download" type="button"
title="Artifacts" class="dropdown-toggle build-artifacts btn btn-default js-pipeline-dropdown-download"
:title="__('Artifacts')"
data-toggle="dropdown" data-toggle="dropdown"
aria-label="Artifacts" :aria-label="__('Artifacts')"
> >
<icon name="download" /> <i class="fa fa-caret-down" aria-hidden="true"> </i> <icon name="download" />
</gl-button> <i class="fa fa-caret-down" aria-hidden="true"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
<li v-for="(artifact, i) in artifacts" :key="i"> <li v-for="(artifact, i) in artifacts" :key="i">
<gl-link :href="artifact.path" rel="nofollow" download> <gl-link :href="artifact.path" rel="nofollow" download
Download {{ artifact.name }} artifacts >Download {{ artifact.name }} artifacts</gl-link
</gl-link> >
</li> </li>
</ul> </ul>
</div> </div>
......
---
title: Fixes not working dropdowns in pipelines page
merge_request:
author:
type: fixed
...@@ -4440,6 +4440,9 @@ msgstr "" ...@@ -4440,6 +4440,9 @@ msgstr ""
msgid "Manifest file import" msgid "Manifest file import"
msgstr "" msgstr ""
msgid "Manual job"
msgstr ""
msgid "Map a FogBugz account ID to a GitLab user" msgid "Map a FogBugz account ID to a GitLab user"
msgstr "" msgstr ""
......
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