Commit 2f1250cd authored by Paul Slaughter's avatar Paul Slaughter

Merge branch 'broken-master-fix-gl-new-button-rename' into 'master'

Rename GlNewButton to GlButton

See merge request gitlab-org/gitlab!29610
parents 845824e0 c741b421
<script> <script>
import { GlNewButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
export default { export default {
components: { components: {
GlNewButton, GlButton,
}, },
}; };
</script> </script>
...@@ -19,10 +19,10 @@ export default { ...@@ -19,10 +19,10 @@ export default {
}} }}
</p> </p>
<div> <div>
<gl-new-button <gl-button
ref="documentationButton" ref="documentationButton"
href="https://gitlab.com/gitlab-org/project-templates/static-site-editor-middleman" href="https://gitlab.com/gitlab-org/project-templates/static-site-editor-middleman"
>{{ s__('StaticSiteEditor|View documentation') }}</gl-new-button >{{ s__('StaticSiteEditor|View documentation') }}</gl-button
> >
</div> </div>
</div> </div>
......
<script> <script>
import PackageTags from '../../shared/components/package_tags.vue'; import PackageTags from '../../shared/components/package_tags.vue';
import PublishMethod from './publish_method.vue'; import PublishMethod from './publish_method.vue';
import { GlNewButton, GlIcon, GlLink, GlSprintf, GlTooltipDirective } from '@gitlab/ui'; import { GlButton, GlIcon, GlLink, GlSprintf, GlTooltipDirective } from '@gitlab/ui';
import { getPackageType } from '../../shared/utils'; import { getPackageType } from '../../shared/utils';
import timeagoMixin from '~/vue_shared/mixins/timeago'; import timeagoMixin from '~/vue_shared/mixins/timeago';
import { mapState } from 'vuex'; import { mapState } from 'vuex';
...@@ -9,7 +9,7 @@ import { mapState } from 'vuex'; ...@@ -9,7 +9,7 @@ import { mapState } from 'vuex';
export default { export default {
name: 'PackagesListRow', name: 'PackagesListRow',
components: { components: {
GlNewButton, GlButton,
GlIcon, GlIcon,
GlLink, GlLink,
GlSprintf, GlSprintf,
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
</div> </div>
<div v-if="deleteAvailable" class="table-section section-10 d-flex justify-content-end"> <div v-if="deleteAvailable" class="table-section section-10 d-flex justify-content-end">
<gl-new-button <gl-button
ref="action-delete" ref="action-delete"
icon="remove" icon="remove"
category="primary" category="primary"
......
...@@ -84,7 +84,7 @@ exports[`packages_list_row renders 1`] = ` ...@@ -84,7 +84,7 @@ exports[`packages_list_row renders 1`] = `
<div <div
class="table-section section-10 d-flex justify-content-end" class="table-section section-10 d-flex justify-content-end"
> >
<gl-new-button-stub <gl-button-stub
aria-label="Remove package" aria-label="Remove package"
category="primary" category="primary"
icon="remove" icon="remove"
......
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