diff options
author | Phil Hughes <me@iamphill.com> | 2019-02-15 18:05:38 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-02-15 18:05:38 +0300 |
commit | 6d34ce73a62f2b108e3fc59d56ce7065e7762eab (patch) | |
tree | a81f683adf306c66eb2e7af622d888625c43205d | |
parent | bd488bc29afbfdfeca5c22ab2caa926525dd666b (diff) | |
parent | 4da7be733dbc27242c93c4c741ab8c4f07e28c34 (diff) |
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
4 files changed, 27 insertions, 16 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_actions.vue index 0152e2fbe04..a250e3236f5 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_actions.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_actions.vue @@ -59,17 +59,19 @@ export default { </script> <template> <div class="btn-group"> - <gl-button + <button v-gl-tooltip + type="button" :disabled="isLoading" class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions" - title="Manual job" + :title="__('Manual job')" 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-button> + </button> <ul class="dropdown-menu dropdown-menu-right"> <li v-for="action in actions" :key="action.path"> diff --git a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue index 908b10afee6..2ab0ad4d013 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue @@ -1,5 +1,5 @@ <script> -import { GlLink, GlButton, GlTooltipDirective } from '@gitlab/ui'; +import { GlLink, GlTooltipDirective } from '@gitlab/ui'; import Icon from '~/vue_shared/components/icon.vue'; export default { @@ -9,7 +9,6 @@ export default { components: { Icon, GlLink, - GlButton, }, props: { artifacts: { @@ -21,20 +20,22 @@ export default { </script> <template> <div class="btn-group" role="group"> - <gl-button + <button v-gl-tooltip - class="dropdown-toggle build-artifacts js-pipeline-dropdown-download" - title="Artifacts" + type="button" + class="dropdown-toggle build-artifacts btn btn-default js-pipeline-dropdown-download" + :title="__('Artifacts')" data-toggle="dropdown" - aria-label="Artifacts" + :aria-label="__('Artifacts')" > - <icon name="download" /> <i class="fa fa-caret-down" aria-hidden="true"> </i> - </gl-button> + <icon name="download" /> + <i class="fa fa-caret-down" aria-hidden="true"></i> + </button> <ul class="dropdown-menu dropdown-menu-right"> <li v-for="(artifact, i) in artifacts" :key="i"> - <gl-link :href="artifact.path" rel="nofollow" download> - Download {{ artifact.name }} artifacts - </gl-link> + <gl-link :href="artifact.path" rel="nofollow" download + >Download {{ artifact.name }} artifacts</gl-link + > </li> </ul> </div> diff --git a/changelogs/unreleased/55893-artifacts-download.yml b/changelogs/unreleased/55893-artifacts-download.yml new file mode 100644 index 00000000000..30c118b7094 --- /dev/null +++ b/changelogs/unreleased/55893-artifacts-download.yml @@ -0,0 +1,5 @@ +--- +title: Fixes not working dropdowns in pipelines page +merge_request: +author: +type: fixed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index b3356a018d9..5ac9d7c8bd4 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4440,6 +4440,9 @@ msgstr "" msgid "Manifest file import" msgstr "" +msgid "Manual job" +msgstr "" + msgid "Map a FogBugz account ID to a GitLab user" msgstr "" |