Merge branch 'mg-upgrade-prettier-again' into 'master'
Upgrade prettier to v1.15.3 See merge request gitlab-org/gitlab-ce!24312
This commit is contained in:
commit
c18a214ec0
68 changed files with 124 additions and 133 deletions
|
@ -55,7 +55,7 @@ export default {
|
|||
:disabled="badge.isDeleting"
|
||||
class="btn btn-default append-right-8"
|
||||
type="button"
|
||||
@click="editBadge(badge);"
|
||||
@click="editBadge(badge)"
|
||||
>
|
||||
<icon :size="16" :aria-label="__('Edit')" name="pencil" />
|
||||
</button>
|
||||
|
@ -65,7 +65,7 @@ export default {
|
|||
type="button"
|
||||
data-toggle="modal"
|
||||
data-target="#delete-badge-modal"
|
||||
@click="updateBadgeInModal(badge);"
|
||||
@click="updateBadgeInModal(badge)"
|
||||
>
|
||||
<icon :size="16" :aria-label="__('Delete')" name="remove" />
|
||||
</button>
|
||||
|
|
|
@ -86,7 +86,7 @@ export default {
|
|||
class="board-card"
|
||||
@mousedown="mouseDown"
|
||||
@mousemove="mouseMove"
|
||||
@mouseup="showIssue($event);"
|
||||
@mouseup="showIssue($event)"
|
||||
>
|
||||
<issue-card-inner
|
||||
:list="list"
|
||||
|
|
|
@ -96,7 +96,7 @@ export default {
|
|||
<template>
|
||||
<div class="board-new-issue-form">
|
||||
<div class="board-card">
|
||||
<form @submit="submit($event);">
|
||||
<form @submit="submit($event)">
|
||||
<div v-if="error" class="flash-container">
|
||||
<div class="flash-alert">An error occurred. Please try again.</div>
|
||||
</div>
|
||||
|
|
|
@ -184,7 +184,7 @@ export default {
|
|||
:title="label.description"
|
||||
class="badge color-label append-right-4 prepend-top-4"
|
||||
type="button"
|
||||
@click="filterByLabel(label);"
|
||||
@click="filterByLabel(label)"
|
||||
>
|
||||
{{ label.title }}
|
||||
</button>
|
||||
|
|
|
@ -58,7 +58,7 @@ export default {
|
|||
v-if="activeTab === 'selected'"
|
||||
class="btn btn-default"
|
||||
type="button"
|
||||
@click="changeTab('all');"
|
||||
@click="changeTab('all')"
|
||||
>
|
||||
Open issues
|
||||
</button>
|
||||
|
|
|
@ -71,7 +71,7 @@ export default {
|
|||
<span class="inline add-issues-footer-to-list"> to list </span>
|
||||
<lists-dropdown />
|
||||
</div>
|
||||
<button class="btn btn-default float-right" type="button" @click="toggleModal(false);">
|
||||
<button class="btn btn-default float-right" type="button" @click="toggleModal(false)">
|
||||
Cancel
|
||||
</button>
|
||||
</footer>
|
||||
|
|
|
@ -58,7 +58,7 @@ export default {
|
|||
class="close"
|
||||
data-dismiss="modal"
|
||||
aria-label="Close"
|
||||
@click="toggleModal(false);"
|
||||
@click="toggleModal(false)"
|
||||
>
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
|
|
|
@ -130,7 +130,7 @@ export default {
|
|||
<div
|
||||
:class="{ 'is-active': issue.selected }"
|
||||
class="board-card"
|
||||
@click="toggleIssue($event, issue);"
|
||||
@click="toggleIssue($event, issue)"
|
||||
>
|
||||
<issue-card-inner :issue="issue" :issue-link-base="issueLinkBase" :root-path="rootPath" />
|
||||
<icon
|
||||
|
|
|
@ -38,7 +38,7 @@ export default {
|
|||
:class="{ 'is-active': list.id == selected.id }"
|
||||
href="#"
|
||||
role="button"
|
||||
@click.prevent="modal.selectedList = list;"
|
||||
@click.prevent="modal.selectedList = list"
|
||||
>
|
||||
<span :style="{ backgroundColor: list.label.color }" class="dropdown-label-box"> </span>
|
||||
{{ list.title }}
|
||||
|
|
|
@ -21,12 +21,12 @@ export default {
|
|||
<div class="top-area prepend-top-10 append-bottom-10">
|
||||
<ul class="nav-links issues-state-filters">
|
||||
<li :class="{ active: activeTab == 'all' }">
|
||||
<a href="#" role="button" @click.prevent="changeTab('all');">
|
||||
<a href="#" role="button" @click.prevent="changeTab('all')">
|
||||
Open issues <span class="badge badge-pill"> {{ issuesCount }} </span>
|
||||
</a>
|
||||
</li>
|
||||
<li :class="{ active: activeTab == 'selected' }">
|
||||
<a href="#" role="button" @click.prevent="changeTab('selected');">
|
||||
<a href="#" role="button" @click.prevent="changeTab('selected')">
|
||||
Selected issues <span class="badge badge-pill"> {{ selectedCount }} </span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
@ -127,7 +127,7 @@ export default {
|
|||
:save-button-title="__('Comment')"
|
||||
class="diff-comment-form new-note discussion-form discussion-form-container"
|
||||
@handleFormUpdate="handleSaveNote"
|
||||
@cancelForm="closeDiffFileCommentForm(diffFile.file_hash);"
|
||||
@cancelForm="closeDiffFileCommentForm(diffFile.file_hash)"
|
||||
/>
|
||||
</div>
|
||||
</diff-viewer>
|
||||
|
|
|
@ -68,7 +68,7 @@ export default {
|
|||
}"
|
||||
type="button"
|
||||
class="js-diff-notes-toggle"
|
||||
@click="toggleDiscussion({ discussionId: discussion.id });"
|
||||
@click="toggleDiscussion({ discussionId: discussion.id })"
|
||||
>
|
||||
<icon v-if="discussion.expanded" name="collapse" class="collapse-icon" />
|
||||
<template v-else>
|
||||
|
|
|
@ -145,7 +145,7 @@ export default {
|
|||
<div
|
||||
ref="header"
|
||||
class="js-file-title file-title file-title-flex-parent"
|
||||
@click="handleToggleFile($event, true);"
|
||||
@click="handleToggleFile($event, true)"
|
||||
>
|
||||
<div class="file-header-content">
|
||||
<icon
|
||||
|
|
|
@ -179,7 +179,7 @@ export default {
|
|||
v-if="lineNumber"
|
||||
:data-linenumber="lineNumber"
|
||||
:href="lineHref"
|
||||
@click="setHighlightedRow(lineCode);"
|
||||
@click="setHighlightedRow(lineCode)"
|
||||
>
|
||||
</a>
|
||||
<diff-gutter-avatars v-if="shouldShowAvatarsOnGutter" :discussions="line.discussions" />
|
||||
|
|
|
@ -97,7 +97,7 @@ export default {
|
|||
v-if="canComment"
|
||||
type="button"
|
||||
class="btn-transparent position-absolute image-diff-overlay-add-comment w-100 h-100 js-add-image-diff-note-button"
|
||||
@click="clickedImage($event.offsetX, $event.offsetY);"
|
||||
@click="clickedImage($event.offsetX, $event.offsetY)"
|
||||
>
|
||||
<span class="sr-only"> {{ __('Add image comment') }} </span>
|
||||
</button>
|
||||
|
@ -109,7 +109,7 @@ export default {
|
|||
:disabled="!shouldToggleDiscussion"
|
||||
class="js-image-badge"
|
||||
type="button"
|
||||
@click="toggleDiscussion({ discussionId: discussion.id });"
|
||||
@click="toggleDiscussion({ discussionId: discussion.id })"
|
||||
>
|
||||
<icon v-if="showCommentIcon" name="image-comment-dark" />
|
||||
<template v-else>
|
||||
|
|
|
@ -81,7 +81,7 @@ export default {
|
|||
:placeholder="s__('MergeRequest|Filter files')"
|
||||
type="search"
|
||||
class="form-control"
|
||||
@focus="toggleFocusSearch(true);"
|
||||
@focus="toggleFocusSearch(true)"
|
||||
@blur="blurSearch"
|
||||
/>
|
||||
<button
|
||||
|
@ -104,7 +104,7 @@ export default {
|
|||
}"
|
||||
class="btn btn-default pt-0 pb-0 d-flex align-items-center"
|
||||
type="button"
|
||||
@click="toggleRenderTreeList(false);"
|
||||
@click="toggleRenderTreeList(false)"
|
||||
>
|
||||
<icon name="hamburger" />
|
||||
</button>
|
||||
|
@ -117,7 +117,7 @@ export default {
|
|||
}"
|
||||
class="btn btn-default pt-0 pb-0 d-flex align-items-center"
|
||||
type="button"
|
||||
@click="toggleRenderTreeList(true);"
|
||||
@click="toggleRenderTreeList(true)"
|
||||
>
|
||||
<icon name="file-tree" />
|
||||
</button>
|
||||
|
|
|
@ -92,7 +92,7 @@ export default {
|
|||
:disabled="isActionDisabled(action)"
|
||||
type="button"
|
||||
class="js-manual-action-link no-btn btn d-flex align-items-center"
|
||||
@click="onClickAction(action);"
|
||||
@click="onClickAction(action)"
|
||||
>
|
||||
<span class="flex-fill"> {{ action.name }} </span>
|
||||
<span v-if="action.scheduledAt" class="text-secondary">
|
||||
|
|
|
@ -66,7 +66,7 @@ export default {
|
|||
<button
|
||||
type="button"
|
||||
class="filtered-search-history-dropdown-item"
|
||||
@click="onItemActivated(item.text);"
|
||||
@click="onItemActivated(item.text)"
|
||||
>
|
||||
<span>
|
||||
<span
|
||||
|
@ -88,7 +88,7 @@ export default {
|
|||
<button
|
||||
type="button"
|
||||
class="filtered-search-history-clear-button"
|
||||
@click="onRequestClearRecentSearches($event);"
|
||||
@click="onRequestClearRecentSearches($event)"
|
||||
>
|
||||
Clear recent searches
|
||||
</button>
|
||||
|
|
|
@ -45,7 +45,7 @@ export default {
|
|||
data-placement="right"
|
||||
type="button"
|
||||
class="ide-sidebar-link js-ide-edit-mode"
|
||||
@click.prevent="changedActivityView($event, $options.activityBarViews.edit);"
|
||||
@click.prevent="changedActivityView($event, $options.activityBarViews.edit)"
|
||||
>
|
||||
<icon name="code" />
|
||||
</button>
|
||||
|
@ -62,7 +62,7 @@ export default {
|
|||
data-placement="right"
|
||||
type="button"
|
||||
class="ide-sidebar-link js-ide-review-mode"
|
||||
@click.prevent="changedActivityView($event, $options.activityBarViews.review);"
|
||||
@click.prevent="changedActivityView($event, $options.activityBarViews.review)"
|
||||
>
|
||||
<icon name="file-modified" />
|
||||
</button>
|
||||
|
@ -79,7 +79,7 @@ export default {
|
|||
data-placement="right"
|
||||
type="button"
|
||||
class="ide-sidebar-link js-ide-commit-mode"
|
||||
@click.prevent="changedActivityView($event, $options.activityBarViews.commit);"
|
||||
@click.prevent="changedActivityView($event, $options.activityBarViews.commit)"
|
||||
>
|
||||
<icon name="commit" />
|
||||
</button>
|
||||
|
|
|
@ -111,8 +111,8 @@ export default {
|
|||
name="commit-message"
|
||||
@scroll="handleScroll"
|
||||
@input="onInput"
|
||||
@focus="updateIsFocused(true);"
|
||||
@blur="updateIsFocused(false);"
|
||||
@focus="updateIsFocused(true)"
|
||||
@blur="updateIsFocused(false)"
|
||||
@keydown.ctrl.enter="onCtrlEnter"
|
||||
@keydown.meta.enter="onCtrlEnter"
|
||||
>
|
||||
|
|
|
@ -65,7 +65,7 @@ export default {
|
|||
:disabled="disabled"
|
||||
type="radio"
|
||||
name="commit-action"
|
||||
@change="updateCommitAction($event.target.value);"
|
||||
@change="updateCommitAction($event.target.value)"
|
||||
/>
|
||||
<span class="prepend-left-10">
|
||||
<span v-if="label" class="ide-radio-label"> {{ label }} </span> <slot v-else></slot>
|
||||
|
@ -76,7 +76,7 @@ export default {
|
|||
:placeholder="newBranchName"
|
||||
type="text"
|
||||
class="form-control monospace"
|
||||
@input="updateBranchName($event.target.value);"
|
||||
@input="updateBranchName($event.target.value)"
|
||||
/>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
|
|
@ -48,7 +48,7 @@ export default {
|
|||
data-container="body"
|
||||
data-boundary="viewport"
|
||||
data-placement="bottom"
|
||||
@click.stop.prevent="stageChange(path);"
|
||||
@click.stop.prevent="stageChange(path)"
|
||||
>
|
||||
<icon :size="16" name="mobile-issue-close" class="ml-auto mr-auto" />
|
||||
</button>
|
||||
|
@ -70,7 +70,7 @@ export default {
|
|||
:header-title-text="modalTitle"
|
||||
:footer-primary-button-text="__('Discard changes')"
|
||||
footer-primary-button-variant="danger"
|
||||
@submit="discardFileChanges(path);"
|
||||
@submit="discardFileChanges(path)"
|
||||
>
|
||||
{{ __("You will loose all changes you've made to this file. This action cannot be undone.") }}
|
||||
</gl-modal>
|
||||
|
|
|
@ -33,7 +33,7 @@ export default {
|
|||
data-container="body"
|
||||
data-boundary="viewport"
|
||||
data-placement="bottom"
|
||||
@click.stop.prevent="unstageChange(path);"
|
||||
@click.stop.prevent="unstageChange(path)"
|
||||
>
|
||||
<icon :size="16" name="redo" class="ml-auto mr-auto" />
|
||||
</button>
|
||||
|
|
|
@ -40,7 +40,7 @@ export default {
|
|||
'is-active': viewer === $options.viewerTypes.mr,
|
||||
}"
|
||||
href="#"
|
||||
@click.prevent="changeMode($options.viewerTypes.mr);"
|
||||
@click.prevent="changeMode($options.viewerTypes.mr)"
|
||||
>
|
||||
<strong class="dropdown-menu-inner-title"> {{ mergeReviewLine }} </strong>
|
||||
<span class="dropdown-menu-inner-content">
|
||||
|
@ -54,7 +54,7 @@ export default {
|
|||
'is-active': viewer === $options.viewerTypes.diff,
|
||||
}"
|
||||
href="#"
|
||||
@click.prevent="changeMode($options.viewerTypes.diff);"
|
||||
@click.prevent="changeMode($options.viewerTypes.diff)"
|
||||
>
|
||||
<strong class="dropdown-menu-inner-title">{{ __('Reviewing') }}</strong>
|
||||
<span class="dropdown-menu-inner-content">
|
||||
|
|
|
@ -164,7 +164,7 @@ export default {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<div class="ide-file-finder-overlay" @mousedown.self="toggleFileFinder(false);">
|
||||
<div class="ide-file-finder-overlay" @mousedown.self="toggleFileFinder(false)">
|
||||
<div class="dropdown-menu diff-file-changes ide-file-finder show">
|
||||
<div class="dropdown-input">
|
||||
<input
|
||||
|
@ -174,8 +174,8 @@ export default {
|
|||
type="search"
|
||||
class="dropdown-input-field"
|
||||
autocomplete="off"
|
||||
@keydown="onKeydown($event);"
|
||||
@keyup="onKeyup($event);"
|
||||
@keydown="onKeydown($event)"
|
||||
@keyup="onKeyup($event)"
|
||||
/>
|
||||
<i
|
||||
:class="{
|
||||
|
|
|
@ -91,7 +91,7 @@ export default {
|
|||
<gl-loading-icon v-if="showLoading" :size="2" />
|
||||
<ul v-else>
|
||||
<li v-for="(item, index) in outputData" :key="index">
|
||||
<button type="button" @click="clickItem(item);">{{ item.name }}</button>
|
||||
<button type="button" @click="clickItem(item)">{{ item.name }}</button>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -84,7 +84,7 @@ export default {
|
|||
<button
|
||||
type="button"
|
||||
class="p-0 border-0 h-50"
|
||||
@click="openRightPane($options.rightSidebarViews.pipelines);"
|
||||
@click="openRightPane($options.rightSidebarViews.pipelines)"
|
||||
>
|
||||
<ci-icon
|
||||
v-tooltip
|
||||
|
|
|
@ -43,7 +43,7 @@ export default {
|
|||
:show-label="false"
|
||||
class="d-flex border-0 p-0 mr-3 qa-new-file"
|
||||
icon="doc-new"
|
||||
@click="openNewEntryModal({ type: 'blob' });"
|
||||
@click="openNewEntryModal({ type: 'blob' })"
|
||||
/>
|
||||
<upload
|
||||
:show-label="false"
|
||||
|
@ -56,7 +56,7 @@ export default {
|
|||
:show-label="false"
|
||||
class="d-flex border-0 p-0"
|
||||
icon="folder-new"
|
||||
@click="openNewEntryModal({ type: 'tree' });"
|
||||
@click="openNewEntryModal({ type: 'tree' })"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
@ -75,7 +75,7 @@ export default {
|
|||
<template>
|
||||
<div class="ide-pipeline build-page d-flex flex-column flex-fill">
|
||||
<header class="ide-job-header d-flex align-items-center">
|
||||
<button class="btn btn-default btn-sm d-flex" @click="setDetailJob(null);">
|
||||
<button class="btn btn-default btn-sm d-flex" @click="setDetailJob(null)">
|
||||
<icon name="chevron-left" /> {{ __('View jobs') }}
|
||||
</button>
|
||||
</header>
|
||||
|
|
|
@ -84,7 +84,7 @@ export default {
|
|||
:placeholder="__('Search merge requests')"
|
||||
@focus="onSearchFocus"
|
||||
@input="searchMergeRequests"
|
||||
@removeToken="setSearchType(null);"
|
||||
@removeToken="setSearchType(null)"
|
||||
/>
|
||||
<icon :size="18" name="search" class="input-icon" />
|
||||
</div>
|
||||
|
@ -102,7 +102,7 @@ export default {
|
|||
<button
|
||||
type="button"
|
||||
class="btn-link d-flex align-items-center"
|
||||
@click.stop="setSearchType(searchType);"
|
||||
@click.stop="setSearchType(searchType)"
|
||||
>
|
||||
<span class="d-flex append-right-default ide-search-list-current-icon">
|
||||
<icon :size="18" name="search" />
|
||||
|
|
|
@ -73,7 +73,7 @@ export default {
|
|||
:aria-label="__('Create new file or directory')"
|
||||
type="button"
|
||||
class="rounded border-0 d-flex ide-entry-dropdown-toggle"
|
||||
@click.stop="openDropdown();"
|
||||
@click.stop="openDropdown()"
|
||||
>
|
||||
<icon name="ellipsis_v" /> <icon name="arrow-down" />
|
||||
</button>
|
||||
|
@ -85,7 +85,7 @@ export default {
|
|||
class="d-flex"
|
||||
icon="doc-new"
|
||||
icon-classes="mr-2"
|
||||
@click="createNewItem('blob');"
|
||||
@click="createNewItem('blob')"
|
||||
/>
|
||||
</li>
|
||||
<li><upload :path="path" @create="createTempEntry" /></li>
|
||||
|
@ -95,7 +95,7 @@ export default {
|
|||
class="d-flex"
|
||||
icon="folder-new"
|
||||
icon-classes="mr-2"
|
||||
@click="createNewItem($options.modalTypes.tree);"
|
||||
@click="createNewItem($options.modalTypes.tree)"
|
||||
/>
|
||||
</li>
|
||||
<li class="divider"></li>
|
||||
|
@ -106,7 +106,7 @@ export default {
|
|||
class="d-flex"
|
||||
icon="pencil"
|
||||
icon-classes="mr-2"
|
||||
@click="createNewItem($options.modalTypes.rename);"
|
||||
@click="createNewItem($options.modalTypes.rename)"
|
||||
/>
|
||||
</li>
|
||||
<li>
|
||||
|
@ -115,7 +115,7 @@ export default {
|
|||
class="d-flex"
|
||||
icon="remove"
|
||||
icon-classes="mr-2"
|
||||
@click="deleteEntry(path);"
|
||||
@click="deleteEntry(path)"
|
||||
/>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
@ -114,7 +114,7 @@ export default {
|
|||
<button
|
||||
type="button"
|
||||
class="btn btn-missing p-1 pr-2 pl-2"
|
||||
@click="createFromTemplate(template);"
|
||||
@click="createFromTemplate(template)"
|
||||
>
|
||||
{{ template.name }}
|
||||
</button>
|
||||
|
|
|
@ -122,7 +122,7 @@ export default {
|
|||
data-placement="left"
|
||||
class="ide-sidebar-link is-right"
|
||||
type="button"
|
||||
@click="clickTab($event, tab);"
|
||||
@click="clickTab($event, tab)"
|
||||
>
|
||||
<icon :size="16" :name="tab.icon" />
|
||||
</button>
|
||||
|
|
|
@ -219,7 +219,7 @@ export default {
|
|||
<a
|
||||
href="javascript:void(0);"
|
||||
role="button"
|
||||
@click.prevent="setFileViewMode({ file, viewMode: 'editor' });"
|
||||
@click.prevent="setFileViewMode({ file, viewMode: 'editor' })"
|
||||
>
|
||||
<template v-if="viewer === $options.viewerTypes.edit">
|
||||
{{ __('Edit') }}
|
||||
|
@ -233,7 +233,7 @@ export default {
|
|||
<a
|
||||
href="javascript:void(0);"
|
||||
role="button"
|
||||
@click.prevent="setFileViewMode({ file, viewMode: 'preview' });"
|
||||
@click.prevent="setFileViewMode({ file, viewMode: 'preview' })"
|
||||
>
|
||||
{{ file.previewMode.previewTitle }}
|
||||
</a>
|
||||
|
|
|
@ -74,7 +74,7 @@ export default {
|
|||
active: tab.active,
|
||||
disabled: tab.pending,
|
||||
}"
|
||||
@click="clickFile(tab);"
|
||||
@click="clickFile(tab)"
|
||||
@mouseover="mouseOverTab"
|
||||
@mouseout="mouseOutTab"
|
||||
>
|
||||
|
@ -88,7 +88,7 @@ export default {
|
|||
:disabled="tab.pending"
|
||||
type="button"
|
||||
class="multi-file-tab-close"
|
||||
@click.stop.prevent="closeFile(tab);"
|
||||
@click.stop.prevent="closeFile(tab)"
|
||||
>
|
||||
<icon v-if="!showChangedIcon" :size="12" name="close" />
|
||||
<changed-file-icon v-else :file="tab" />
|
||||
|
|
|
@ -78,8 +78,8 @@ export default {
|
|||
:min-size="minSize"
|
||||
:max-size="$options.maxSize"
|
||||
:side="side === 'right' ? 'left' : 'right'"
|
||||
@resize-start="setResizingStatus(true);"
|
||||
@resize-end="setResizingStatus(false);"
|
||||
@resize-start="setResizingStatus(true)"
|
||||
@resize-end="setResizingStatus(false)"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
@ -76,8 +76,8 @@ export default {
|
|||
<button
|
||||
class="selectable btn-blank"
|
||||
type="button"
|
||||
@click.stop="removeToken(token);"
|
||||
@keyup.delete="removeToken(token);"
|
||||
@click.stop="removeToken(token)"
|
||||
@keyup.delete="removeToken(token)"
|
||||
>
|
||||
<div class="value-container rounded">
|
||||
<div class="value">{{ token.label }}</div>
|
||||
|
|
|
@ -55,7 +55,7 @@ export default {
|
|||
|
||||
<ul class="dropdown-menu">
|
||||
<li v-for="stage in stages" :key="stage.name">
|
||||
<button type="button" class="js-stage-item stage-item" @click="onStageClick(stage);">
|
||||
<button type="button" class="js-stage-item stage-item" @click="onStageClick(stage)">
|
||||
{{ stage.name }}
|
||||
</button>
|
||||
</li>
|
||||
|
|
|
@ -257,8 +257,8 @@ export default {
|
|||
<template>
|
||||
<div
|
||||
class="prometheus-graph"
|
||||
@mouseover="showFlagContent = true;"
|
||||
@mouseleave="showFlagContent = false;"
|
||||
@mouseover="showFlagContent = true"
|
||||
@mouseleave="showFlagContent = false"
|
||||
>
|
||||
<div class="prometheus-graph-header">
|
||||
<h5 class="prometheus-graph-title">{{ graphData.title }}</h5>
|
||||
|
@ -300,7 +300,7 @@ export default {
|
|||
:height="graphHeight - 100"
|
||||
class="prometheus-graph-overlay"
|
||||
transform="translate(-5, 20)"
|
||||
@mousemove="handleMouseOverGraph($event);"
|
||||
@mousemove="handleMouseOverGraph($event)"
|
||||
/>
|
||||
</svg>
|
||||
<svg v-else :viewBox="innerViewBox" class="js-no-data-to-display">
|
||||
|
|
|
@ -357,9 +357,9 @@ js-gfm-input js-autosize markdown-area js-vue-textarea qa-comment-input"
|
|||
data-supports-quick-actions="true"
|
||||
aria-label="Description"
|
||||
placeholder="Write a comment or drag your files here…"
|
||||
@keydown.up="editCurrentUserLastNote();"
|
||||
@keydown.meta.enter="handleSave();"
|
||||
@keydown.ctrl.enter="handleSave();"
|
||||
@keydown.up="editCurrentUserLastNote()"
|
||||
@keydown.meta.enter="handleSave()"
|
||||
@keydown.ctrl.enter="handleSave()"
|
||||
>
|
||||
</textarea>
|
||||
</markdown-field>
|
||||
|
@ -373,7 +373,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
|
|||
class="btn btn-success js-comment-button js-comment-submit-button
|
||||
qa-comment-button"
|
||||
type="submit"
|
||||
@click.prevent="handleSave();"
|
||||
@click.prevent="handleSave()"
|
||||
>
|
||||
{{ __(commentButtonTitle) }}
|
||||
</button>
|
||||
|
@ -394,7 +394,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
|
|||
<button
|
||||
type="button"
|
||||
class="btn btn-transparent"
|
||||
@click.prevent="setNoteType('comment');"
|
||||
@click.prevent="setNoteType('comment')"
|
||||
>
|
||||
<i aria-hidden="true" class="fa fa-check icon"> </i>
|
||||
<div class="description">
|
||||
|
@ -408,7 +408,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
|
|||
<button
|
||||
type="button"
|
||||
class="btn btn-transparent qa-discussion-option"
|
||||
@click.prevent="setNoteType('discussion');"
|
||||
@click.prevent="setNoteType('discussion')"
|
||||
>
|
||||
<i aria-hidden="true" class="fa fa-check icon"> </i>
|
||||
<div class="description">
|
||||
|
@ -429,7 +429,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
|
|||
]"
|
||||
:disabled="isToggleStateButtonLoading || isSubmitting"
|
||||
:label="issueActionButtonTitle"
|
||||
@click="handleSave(true);"
|
||||
@click="handleSave(true)"
|
||||
/>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
@ -112,7 +112,7 @@ export default {
|
|||
:class="{ 'is-active': filter.value === currentValue }"
|
||||
class="qa-filter-options"
|
||||
type="button"
|
||||
@click="selectFilter(filter.value);"
|
||||
@click="selectFilter(filter.value)"
|
||||
>
|
||||
{{ filter.title }}
|
||||
</button>
|
||||
|
|
|
@ -174,7 +174,7 @@ export default {
|
|||
data-placement="bottom"
|
||||
class="btn award-control"
|
||||
type="button"
|
||||
@click="handleAward(awardName);"
|
||||
@click="handleAward(awardName)"
|
||||
>
|
||||
<span v-html="getAwardHTML(awardName)"></span>
|
||||
<span class="award-control-text js-counter">{{ awardList.length }}</span>
|
||||
|
|
|
@ -219,10 +219,10 @@ export default {
|
|||
class="note-textarea js-gfm-input js-note-text js-autosize markdown-area js-vue-issue-note-form js-vue-textarea qa-reply-input"
|
||||
aria-label="Description"
|
||||
placeholder="Write a comment or drag your files here…"
|
||||
@keydown.meta.enter="handleKeySubmit();"
|
||||
@keydown.ctrl.enter="handleKeySubmit();"
|
||||
@keydown.up="editMyLastNote();"
|
||||
@keydown.esc="cancelHandler(true);"
|
||||
@keydown.meta.enter="handleKeySubmit()"
|
||||
@keydown.ctrl.enter="handleKeySubmit()"
|
||||
@keydown.up="editMyLastNote()"
|
||||
@keydown.esc="cancelHandler(true)"
|
||||
></textarea>
|
||||
</markdown-field>
|
||||
<div class="note-form-actions clearfix">
|
||||
|
@ -230,21 +230,21 @@ export default {
|
|||
:disabled="isDisabled"
|
||||
type="button"
|
||||
class="js-vue-issue-save btn btn-success js-comment-button qa-reply-comment-button"
|
||||
@click="handleUpdate();"
|
||||
@click="handleUpdate()"
|
||||
>
|
||||
{{ saveButtonTitle }}
|
||||
</button>
|
||||
<button
|
||||
v-if="discussion.resolvable"
|
||||
class="btn btn-nr btn-default append-right-10 js-comment-resolve-button"
|
||||
@click.prevent="handleUpdate(true);"
|
||||
@click.prevent="handleUpdate(true)"
|
||||
>
|
||||
{{ resolveButtonTitle }}
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-cancel note-edit-cancel js-close-discussion-note-form"
|
||||
type="button"
|
||||
@click="cancelHandler();"
|
||||
@click="cancelHandler()"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
|
|
|
@ -440,7 +440,7 @@ Please check your network connection and try again.`;
|
|||
<button
|
||||
type="button"
|
||||
class="btn btn-default ml-sm-2"
|
||||
@click="resolveHandler();"
|
||||
@click="resolveHandler()"
|
||||
>
|
||||
<i v-if="isResolving" aria-hidden="true" class="fa fa-spinner fa-spin"></i>
|
||||
{{ resolveButtonTitle }}
|
||||
|
|
|
@ -70,7 +70,7 @@ export default {
|
|||
:checked="isEditable"
|
||||
class="label-bold"
|
||||
type="radio"
|
||||
@click="toggleCustomInput(true);"
|
||||
@click="toggleCustomInput(true)"
|
||||
/>
|
||||
|
||||
<label for="custom"> {{ s__('PipelineSheduleIntervalPattern|Custom') }} </label>
|
||||
|
@ -88,7 +88,7 @@ export default {
|
|||
:value="cronIntervalPresets.everyDay"
|
||||
class="label-bold"
|
||||
type="radio"
|
||||
@click="toggleCustomInput(false);"
|
||||
@click="toggleCustomInput(false)"
|
||||
/>
|
||||
|
||||
<label class="label-bold" for="every-day"> {{ __('Every day (at 4:00am)') }} </label>
|
||||
|
@ -102,7 +102,7 @@ export default {
|
|||
:value="cronIntervalPresets.everyWeek"
|
||||
class="label-bold"
|
||||
type="radio"
|
||||
@click="toggleCustomInput(false);"
|
||||
@click="toggleCustomInput(false)"
|
||||
/>
|
||||
|
||||
<label class="label-bold" for="every-week">
|
||||
|
@ -118,7 +118,7 @@ export default {
|
|||
:value="cronIntervalPresets.everyMonth"
|
||||
class="label-bold"
|
||||
type="radio"
|
||||
@click="toggleCustomInput(false);"
|
||||
@click="toggleCustomInput(false)"
|
||||
/>
|
||||
|
||||
<label class="label-bold" for="every-month">
|
||||
|
|
|
@ -77,7 +77,7 @@ export default {
|
|||
:class="{ disabled: isActionDisabled(action) }"
|
||||
:disabled="isActionDisabled(action)"
|
||||
class="js-pipeline-action-link no-btn btn"
|
||||
@click="onClickAction(action);"
|
||||
@click="onClickAction(action)"
|
||||
>
|
||||
{{ action.name }}
|
||||
<span v-if="action.scheduled_at" class="pull-right">
|
||||
|
|
|
@ -108,9 +108,7 @@ export default {
|
|||
</span>
|
||||
</li>
|
||||
<li v-for="result in results" :key="result.id">
|
||||
<button type="button" @click.prevent="setItem(result.name);">
|
||||
{{ result.name }}
|
||||
</button>
|
||||
<button type="button" @click.prevent="setItem(result.name)">{{ result.name }}</button>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -169,7 +169,7 @@ export default {
|
|||
</span>
|
||||
</li>
|
||||
<li v-for="result in results" :key="result.project_number">
|
||||
<button type="button" @click.prevent="setItem(result);">{{ result.name }}</button>
|
||||
<button type="button" @click.prevent="setItem(result)">{{ result.name }}</button>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -82,9 +82,7 @@ export default {
|
|||
</span>
|
||||
</li>
|
||||
<li v-for="result in results" :key="result.id">
|
||||
<button type="button" @click.prevent="setItem(result.name);">
|
||||
{{ result.name }}
|
||||
</button>
|
||||
<button type="button" @click.prevent="setItem(result.name)">{{ result.name }}</button>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -106,7 +106,7 @@ export default {
|
|||
:aria-label="s__('ContainerRegistry|Remove tag')"
|
||||
variant="danger"
|
||||
class="js-delete-registry d-none d-sm-block float-right"
|
||||
@click="handleDeleteRegistry(item);"
|
||||
@click="handleDeleteRegistry(item)"
|
||||
>
|
||||
<icon name="remove" />
|
||||
</gl-button>
|
||||
|
|
|
@ -26,7 +26,7 @@ export default {
|
|||
<button
|
||||
type="button"
|
||||
class="btn-link btn-blank text-left break-link vulnerability-name-button"
|
||||
@click="handleIssueClick();"
|
||||
@click="handleIssueClick()"
|
||||
>
|
||||
{{ issue.title }}
|
||||
</button>
|
||||
|
|
|
@ -30,7 +30,7 @@ export default {
|
|||
<button
|
||||
type="button"
|
||||
class="btn-link btn-blank text-left break-link vulnerability-name-button"
|
||||
@click="openModal({ issue });"
|
||||
@click="openModal({ issue })"
|
||||
>
|
||||
<div v-if="isNew" class="badge badge-danger append-right-5">{{ s__('New') }}</div>
|
||||
{{ issue.name }}
|
||||
|
|
|
@ -219,7 +219,7 @@ export default {
|
|||
name="button"
|
||||
type="button"
|
||||
class="js-clear-user-status-button clear-user-status btn"
|
||||
@click="clearStatusInputs();"
|
||||
@click="clearStatusInputs()"
|
||||
>
|
||||
<icon name="close" />
|
||||
</button>
|
||||
|
|
|
@ -102,13 +102,13 @@ export default {
|
|||
/>
|
||||
<div class="title hide-collapsed">
|
||||
{{ __('Time tracking') }}
|
||||
<div v-if="!showHelpState" class="help-button float-right" @click="toggleHelpState(true);">
|
||||
<div v-if="!showHelpState" class="help-button float-right" @click="toggleHelpState(true)">
|
||||
<i class="fa fa-question-circle" aria-hidden="true"> </i>
|
||||
</div>
|
||||
<div
|
||||
v-if="showHelpState"
|
||||
class="close-help-button float-right"
|
||||
@click="toggleHelpState(false);"
|
||||
@click="toggleHelpState(false)"
|
||||
>
|
||||
<i class="fa fa-close" aria-hidden="true"> </i>
|
||||
</div>
|
||||
|
|
|
@ -241,7 +241,7 @@ export default {
|
|||
:class="mergeButtonClass"
|
||||
type="button"
|
||||
class="qa-merge-button"
|
||||
@click="handleMergeButtonClick();"
|
||||
@click="handleMergeButtonClick()"
|
||||
>
|
||||
<i v-if="isMakingRequest" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
|
||||
{{ mergeButtonText }}
|
||||
|
@ -265,7 +265,7 @@ export default {
|
|||
<a
|
||||
class="merge_when_pipeline_succeeds qa-merge-when-pipeline-succeeds-option"
|
||||
href="#"
|
||||
@click.prevent="handleMergeButtonClick(true);"
|
||||
@click.prevent="handleMergeButtonClick(true)"
|
||||
>
|
||||
<span class="media">
|
||||
<span class="merge-opt-icon" aria-hidden="true" v-html="successSvg"></span>
|
||||
|
@ -277,7 +277,7 @@ export default {
|
|||
<a
|
||||
class="accept-merge-request qa-merge-immediately-option"
|
||||
href="#"
|
||||
@click.prevent="handleMergeButtonClick(false, true);"
|
||||
@click.prevent="handleMergeButtonClick(false, true)"
|
||||
>
|
||||
<span class="media">
|
||||
<span class="merge-opt-icon" aria-hidden="true" v-html="warningSvg"></span>
|
||||
|
|
|
@ -293,8 +293,8 @@ export default {
|
|||
:title="setTooltipTitle(data)"
|
||||
class="bar-rect"
|
||||
data-placement="top"
|
||||
@mouseover="barHoveredIn(index);"
|
||||
@mouseout="barHoveredOut(index);"
|
||||
@mouseover="barHoveredIn(index)"
|
||||
@mouseout="barHoveredOut(index)"
|
||||
/>
|
||||
</template>
|
||||
</g>
|
||||
|
|
|
@ -95,7 +95,7 @@ export default {
|
|||
class="close float-right"
|
||||
data-dismiss="modal"
|
||||
aria-label="Close"
|
||||
@click="emitCancel($event);"
|
||||
@click="emitCancel($event)"
|
||||
>
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
|
@ -112,7 +112,7 @@ export default {
|
|||
type="button"
|
||||
class="btn"
|
||||
data-dismiss="modal"
|
||||
@click="emitCancel($event);"
|
||||
@click="emitCancel($event)"
|
||||
>
|
||||
{{ closeButtonLabel }}
|
||||
</button>
|
||||
|
@ -130,7 +130,7 @@ export default {
|
|||
type="button"
|
||||
class="btn js-primary-button"
|
||||
data-dismiss="modal"
|
||||
@click="emitSubmit($event);"
|
||||
@click="emitSubmit($event)"
|
||||
>
|
||||
{{ primaryButtonLabel }}
|
||||
</button>
|
||||
|
|
|
@ -75,7 +75,7 @@ export default {
|
|||
:class="{
|
||||
active: mode === $options.imageViewMode.twoup,
|
||||
}"
|
||||
@click="changeMode($options.imageViewMode.twoup);"
|
||||
@click="changeMode($options.imageViewMode.twoup)"
|
||||
>
|
||||
{{ s__('ImageDiffViewer|2-up') }}
|
||||
</li>
|
||||
|
@ -83,7 +83,7 @@ export default {
|
|||
:class="{
|
||||
active: mode === $options.imageViewMode.swipe,
|
||||
}"
|
||||
@click="changeMode($options.imageViewMode.swipe);"
|
||||
@click="changeMode($options.imageViewMode.swipe)"
|
||||
>
|
||||
{{ s__('ImageDiffViewer|Swipe') }}
|
||||
</li>
|
||||
|
@ -91,7 +91,7 @@ export default {
|
|||
:class="{
|
||||
active: mode === $options.imageViewMode.onion,
|
||||
}"
|
||||
@click="changeMode($options.imageViewMode.onion);"
|
||||
@click="changeMode($options.imageViewMode.onion)"
|
||||
>
|
||||
{{ s__('ImageDiffViewer|Onion skin') }}
|
||||
</li>
|
||||
|
|
|
@ -139,8 +139,8 @@ export default {
|
|||
class="file-row"
|
||||
role="button"
|
||||
@click="clickFile"
|
||||
@mouseover="toggleHover(true);"
|
||||
@mouseout="toggleHover(false);"
|
||||
@mouseover="toggleHover(true)"
|
||||
@mouseout="toggleHover(false)"
|
||||
>
|
||||
<div class="file-row-name-container">
|
||||
<span ref="textOutput" :style="levelIndentation" class="file-row-name str-truncated">
|
||||
|
|
|
@ -81,7 +81,7 @@ export default {
|
|||
type="button"
|
||||
class="close js-modal-close-action"
|
||||
data-dismiss="modal"
|
||||
@click="emitCancel($event);"
|
||||
@click="emitCancel($event)"
|
||||
>
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
|
@ -96,7 +96,7 @@ export default {
|
|||
type="button"
|
||||
class="btn js-modal-cancel-action qa-modal-cancel-button"
|
||||
data-dismiss="modal"
|
||||
@click="emitCancel($event);"
|
||||
@click="emitCancel($event)"
|
||||
>
|
||||
{{ s__('Modal|Cancel') }}
|
||||
</button>
|
||||
|
@ -105,7 +105,7 @@ export default {
|
|||
type="button"
|
||||
class="btn js-modal-primary-action qa-modal-primary-button"
|
||||
data-dismiss="modal"
|
||||
@click="emitSubmit($event);"
|
||||
@click="emitSubmit($event)"
|
||||
>
|
||||
{{ footerPrimaryButtonText }}
|
||||
</button>
|
||||
|
|
|
@ -148,7 +148,7 @@ export default {
|
|||
:class="action.cssClass"
|
||||
container-class="d-inline"
|
||||
:label="action.label"
|
||||
@click="onClickAction(action);"
|
||||
@click="onClickAction(action)"
|
||||
/>
|
||||
</template>
|
||||
</section>
|
||||
|
|
|
@ -78,12 +78,7 @@ export default {
|
|||
<div class="md-header">
|
||||
<ul class="nav-links clearfix">
|
||||
<li :class="{ active: !previewMarkdown }" class="md-header-tab">
|
||||
<button
|
||||
class="js-write-link"
|
||||
tabindex="-1"
|
||||
type="button"
|
||||
@click="writeMarkdownTab($event);"
|
||||
>
|
||||
<button class="js-write-link" tabindex="-1" type="button" @click="writeMarkdownTab($event)">
|
||||
Write
|
||||
</button>
|
||||
</li>
|
||||
|
@ -92,7 +87,7 @@ export default {
|
|||
class="js-preview-link js-md-preview-button"
|
||||
tabindex="-1"
|
||||
type="button"
|
||||
@click="previewMarkdownTab($event);"
|
||||
@click="previewMarkdownTab($event)"
|
||||
>
|
||||
Preview
|
||||
</button>
|
||||
|
|
|
@ -58,7 +58,7 @@ export default {
|
|||
active: tab.isActive,
|
||||
}"
|
||||
>
|
||||
<a :class="`js-${scope}-tab-${tab.scope}`" role="button" @click="onTabClick(tab);">
|
||||
<a :class="`js-${scope}-tab-${tab.scope}`" role="button" @click="onTabClick(tab)">
|
||||
{{ tab.name }}
|
||||
|
||||
<span v-if="shouldRenderBadge(tab.count)" class="badge badge-pill"> {{ tab.count }} </span>
|
||||
|
|
|
@ -97,7 +97,7 @@ export default {
|
|||
v-html="note.note_html"
|
||||
></div>
|
||||
<div v-if="hasMoreCommits" class="flex-list">
|
||||
<div class="system-note-commit-list-toggler flex-row" @click="expanded = !expanded;">
|
||||
<div class="system-note-commit-list-toggler flex-row" @click="expanded = !expanded">
|
||||
<icon :name="toggleIcon" :size="8" class="append-right-5" />
|
||||
<span>Toggle commit list</span>
|
||||
</div>
|
||||
|
|
|
@ -134,7 +134,7 @@ export default {
|
|||
<button
|
||||
type="button"
|
||||
class="btn-blank btn-link btn-secondary-hover-link"
|
||||
@click="newDateSelected(null);"
|
||||
@click="newDateSelected(null)"
|
||||
>
|
||||
remove
|
||||
</button>
|
||||
|
|
|
@ -149,7 +149,7 @@ export default {
|
|||
}"
|
||||
class="page-item"
|
||||
>
|
||||
<a class="page-link" @click.prevent="changePage(item.title, item.disabled);">
|
||||
<a class="page-link" @click.prevent="changePage(item.title, item.disabled)">
|
||||
{{ item.title }}
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
@ -161,7 +161,7 @@
|
|||
"karma-sourcemap-loader": "^0.3.7",
|
||||
"karma-webpack": "^4.0.0-beta.0",
|
||||
"nodemon": "^1.18.4",
|
||||
"prettier": "1.15.2",
|
||||
"prettier": "1.15.3",
|
||||
"vue-jest": "^3.0.2",
|
||||
"webpack-dev-server": "^3.1.14",
|
||||
"yarn-deduplicate": "^1.0.5"
|
||||
|
|
|
@ -7874,10 +7874,10 @@ prettier@1.13.7:
|
|||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
|
||||
integrity sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==
|
||||
|
||||
prettier@1.15.2:
|
||||
version "1.15.2"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.2.tgz#d31abe22afa4351efa14c7f8b94b58bb7452205e"
|
||||
integrity sha512-YgPLFFA0CdKL4Eg2IHtUSjzj/BWgszDHiNQAe0VAIBse34148whfdzLagRL+QiKS+YfK5ftB6X4v/MBw8yCoug==
|
||||
prettier@1.15.3:
|
||||
version "1.15.3"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
|
||||
integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==
|
||||
|
||||
pretty-format@^23.6.0:
|
||||
version "23.6.0"
|
||||
|
|
Loading…
Reference in a new issue