Commit 663b215c authored by Denys Mishunov's avatar Denys Mishunov

Merge branch 'replace-loading-button-in-epic-header' into 'master'

Replace loading button in epic header

See merge request gitlab-org/gitlab!26153
parents 5e85ec65 4f1dd2d1
...@@ -6,7 +6,6 @@ import { __ } from '~/locale'; ...@@ -6,7 +6,6 @@ import { __ } from '~/locale';
import tooltip from '~/vue_shared/directives/tooltip'; import tooltip from '~/vue_shared/directives/tooltip';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import LoadingButton from '~/vue_shared/components/loading_button.vue';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
import GitlabTeamMemberBadge from '~/vue_shared/components/user_avatar/badges/gitlab_team_member_badge.vue'; import GitlabTeamMemberBadge from '~/vue_shared/components/user_avatar/badges/gitlab_team_member_badge.vue';
...@@ -21,7 +20,6 @@ export default { ...@@ -21,7 +20,6 @@ export default {
components: { components: {
Icon, Icon,
GlDeprecatedButton, GlDeprecatedButton,
LoadingButton,
UserAvatarLink, UserAvatarLink,
TimeagoTooltip, TimeagoTooltip,
GitlabTeamMemberBadge, GitlabTeamMemberBadge,
...@@ -108,12 +106,13 @@ export default { ...@@ -108,12 +106,13 @@ export default {
</div> </div>
</div> </div>
<div v-if="canUpdate" class="detail-page-header-actions js-issuable-actions"> <div v-if="canUpdate" class="detail-page-header-actions js-issuable-actions">
<loading-button <gl-deprecated-button
:label="actionButtonText"
:loading="epicStatusChangeInProgress" :loading="epicStatusChangeInProgress"
:container-class="actionButtonClass" :class="actionButtonClass"
@click="toggleEpicStatus(isEpicOpen)" @click="toggleEpicStatus(isEpicOpen)"
/> >
{{ actionButtonText }}
</gl-deprecated-button>
</div> </div>
<gl-deprecated-button <gl-deprecated-button
:aria-label="__('Toggle sidebar')" :aria-label="__('Toggle sidebar')"
......
...@@ -133,9 +133,7 @@ describe('EpicHeaderComponent', () => { ...@@ -133,9 +133,7 @@ describe('EpicHeaderComponent', () => {
expect(actionsEl).not.toBeNull(); expect(actionsEl).not.toBeNull();
expect(actionsEl.querySelector('.js-btn-epic-action')).not.toBeNull(); expect(actionsEl.querySelector('.js-btn-epic-action')).not.toBeNull();
expect(actionsEl.querySelector('.js-loading-button-label').innerText.trim()).toBe( expect(actionsEl.querySelector('.js-btn-epic-action').innerText.trim()).toBe('Close epic');
'Close epic',
);
}); });
it('renders toggle sidebar button element', () => { it('renders toggle sidebar button element', () => {
......
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