diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 12:09:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 12:09:31 +0300 |
commit | 04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch) | |
tree | 7cb9c0977e09d97da340f48703d79b2dbd3579a0 /app/assets/javascripts/boards | |
parent | 42f41de46525ce0065f02ee07c1a79f5669526a0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/boards')
3 files changed, 19 insertions, 15 deletions
diff --git a/app/assets/javascripts/boards/components/board.js b/app/assets/javascripts/boards/components/board.js index 48f5614cefe..ac02c229a07 100644 --- a/app/assets/javascripts/boards/components/board.js +++ b/app/assets/javascripts/boards/components/board.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import Sortable from 'sortablejs'; import Vue from 'vue'; -import { GlButtonGroup, GlButton, GlLabel, GlTooltip } from '@gitlab/ui'; +import { GlButtonGroup, GlDeprecatedButton, GlLabel, GlTooltip } from '@gitlab/ui'; import isWipLimitsOn from 'ee_else_ce/boards/mixins/is_wip_limits'; import { s__, __, sprintf } from '~/locale'; import Icon from '~/vue_shared/components/icon.vue'; @@ -32,7 +32,7 @@ export default Vue.extend({ Icon, GlButtonGroup, IssueCount, - GlButton, + GlDeprecatedButton, GlLabel, GlTooltip, }, diff --git a/app/assets/javascripts/boards/components/board_column.vue b/app/assets/javascripts/boards/components/board_column.vue index 693b1f9d7b1..10c855675db 100644 --- a/app/assets/javascripts/boards/components/board_column.vue +++ b/app/assets/javascripts/boards/components/board_column.vue @@ -1,7 +1,7 @@ <script> import $ from 'jquery'; import Sortable from 'sortablejs'; -import { GlButtonGroup, GlButton, GlLabel, GlTooltip, GlIcon } from '@gitlab/ui'; +import { GlButtonGroup, GlDeprecatedButton, GlLabel, GlTooltip, GlIcon } from '@gitlab/ui'; import isWipLimitsOn from 'ee_else_ce/boards/mixins/is_wip_limits'; import { s__, __, sprintf } from '~/locale'; import Tooltip from '~/vue_shared/directives/tooltip'; @@ -24,7 +24,7 @@ export default { BoardList, GlButtonGroup, IssueCount, - GlButton, + GlDeprecatedButton, GlLabel, GlTooltip, GlIcon, @@ -333,7 +333,7 @@ export default { v-if="isNewIssueShown || isSettingsShown" class="board-list-button-group pl-2" > - <gl-button + <gl-deprecated-button v-if="isNewIssueShown" ref="newIssueBtn" :class="{ @@ -346,10 +346,10 @@ export default { @click="showNewIssueForm" > <i aria-hidden="true" data-hidden="true" class="fa fa-plus"></i> - </gl-button> + </gl-deprecated-button> <gl-tooltip :target="() => $refs.newIssueBtn">{{ __('New Issue') }}</gl-tooltip> - <gl-button + <gl-deprecated-button v-if="isSettingsShown" ref="settingsBtn" :aria-label="__(`List settings`)" @@ -359,7 +359,7 @@ export default { @click="openSidebarSettings" > <gl-icon name="settings" /> - </gl-button> + </gl-deprecated-button> <gl-tooltip :target="() => $refs.settingsBtn">{{ __('List settings') }}</gl-tooltip> </gl-button-group> </h3> diff --git a/app/assets/javascripts/boards/components/board_new_issue.vue b/app/assets/javascripts/boards/components/board_new_issue.vue index f9a08f151c5..deebe122109 100644 --- a/app/assets/javascripts/boards/components/board_new_issue.vue +++ b/app/assets/javascripts/boards/components/board_new_issue.vue @@ -1,6 +1,6 @@ <script> import $ from 'jquery'; -import { GlButton } from '@gitlab/ui'; +import { GlDeprecatedButton } from '@gitlab/ui'; import { getMilestone } from 'ee_else_ce/boards/boards_util'; import ListIssue from 'ee_else_ce/boards/models/issue'; import eventHub from '../eventhub'; @@ -11,7 +11,7 @@ export default { name: 'BoardNewIssue', components: { ProjectSelect, - GlButton, + GlDeprecatedButton, }, props: { groupId: { @@ -120,17 +120,21 @@ export default { /> <project-select v-if="groupId" :group-id="groupId" :list="list" /> <div class="clearfix prepend-top-10"> - <gl-button + <gl-deprecated-button ref="submit-button" :disabled="disabled" class="float-left" variant="success" type="submit" - >{{ __('Submit issue') }}</gl-button + >{{ __('Submit issue') }}</gl-deprecated-button + > + <gl-deprecated-button + class="float-right" + type="button" + variant="default" + @click="cancel" + >{{ __('Cancel') }}</gl-deprecated-button > - <gl-button class="float-right" type="button" variant="default" @click="cancel">{{ - __('Cancel') - }}</gl-button> </div> </form> </div> |