diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-10-01 20:40:15 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-10-01 20:40:15 +0000 |
| commit | 0ef1060e14b8ac09159e466fe5f4ca3195e080c2 (patch) | |
| tree | 152cbd77b4a29703bbdc34a95282e59c583515de | |
| parent | 4ad247fdf09825c2f03b47c1fa17f4362fdd0401 (diff) | |
| parent | 574bafbfa5a15f82d36892179c8618f9ad5398a3 (diff) | |
| download | gitlab-ce-0ef1060e14b8ac09159e466fe5f4ca3195e080c2.tar.gz | |
Merge branch 'add-gl-link-to-download-viewer' into 'master'
Add link component to download viewer component
See merge request gitlab-org/gitlab-ce!21987
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/add-gl-link-to-download-viewer.yml | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue index f1ef50d0e3d..a07d63a495d 100644 --- a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue @@ -1,9 +1,11 @@ <script> +import { Link } from '@gitlab-org/gitlab-ui'; import Icon from '../../icon.vue'; import { numberToHumanSize } from '../../../../lib/utils/number_utils'; export default { components: { + 'gl-link': Link, Icon, }, props: { @@ -37,7 +39,7 @@ export default { ({{ fileSizeReadable }}) </template> </p> - <a + <gl-link :href="path" class="btn btn-default" rel="nofollow" @@ -49,7 +51,7 @@ export default { css-classes="float-left append-right-8" /> {{ __('Download') }} - </a> + </gl-link> </div> </div> </template> diff --git a/changelogs/unreleased/add-gl-link-to-download-viewer.yml b/changelogs/unreleased/add-gl-link-to-download-viewer.yml new file mode 100644 index 00000000000..ce3d916f045 --- /dev/null +++ b/changelogs/unreleased/add-gl-link-to-download-viewer.yml @@ -0,0 +1,5 @@ +--- +title: Add link component to DownloadViewer component +merge_request: 21987 +author: George Tsiolis +type: other |