Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-09-19 12:09:52 +00:00
parent e2dc98865b
commit e3ae3532a1

View file

@ -1,7 +1,7 @@
<script>
import { isEmpty } from 'lodash';
import { mapActions, mapState } from 'vuex';
import { GlLink, GlDeprecatedButton, GlIcon } from '@gitlab/ui';
import { GlLink, GlButton, GlIcon } from '@gitlab/ui';
import { __, sprintf } from '~/locale';
import timeagoMixin from '~/vue_shared/mixins/timeago';
import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
@ -24,7 +24,7 @@ export default {
StagesDropdown,
JobsContainer,
GlLink,
GlDeprecatedButton,
GlButton,
TooltipOnTruncate,
},
mixins: [timeagoMixin],
@ -143,14 +143,13 @@ export default {
>
</div>
<gl-deprecated-button
<gl-button
:aria-label="__('Toggle Sidebar')"
type="button"
class="btn btn-blank gutter-toggle float-right d-block d-md-none js-sidebar-build-toggle"
class="d-md-none gl-ml-2 js-sidebar-build-toggle"
category="tertiary"
icon="chevron-double-lg-right"
@click="toggleSidebar"
>
<i aria-hidden="true" data-hidden="true" class="fa fa-angle-double-right"></i>
</gl-deprecated-button>
/>
</div>
<div v-if="job.terminal_path || job.new_issue_path" class="block retry-link">