Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
b8eb04254af3
Commit
b8eb0425
authored
Dec 11, 2019
by
GitLab Bot
Browse files
Add latest changes from gitlab-org/gitlab@master
parent
221b1159d254
Changes
99
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/commons/polyfills.js
View file @
b8eb0425
...
...
@@ -4,6 +4,7 @@
import
'
core-js/es/array/find-index
'
;
import
'
core-js/es/array/from
'
;
import
'
core-js/es/array/includes
'
;
import
'
core-js/es/number/is-integer
'
;
import
'
core-js/es/object/assign
'
;
import
'
core-js/es/object/values
'
;
import
'
core-js/es/object/entries
'
;
...
...
app/assets/javascripts/create_cluster/eks_cluster/components/cluster_form_dropdown.vue
View file @
b8eb0425
<
script
>
import
$
from
'
jquery
'
;
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
DropdownSearchInput
from
'
~/vue_shared/components/dropdown/dropdown_search_input.vue
'
;
import
DropdownHiddenInput
from
'
~/vue_shared/components/dropdown/dropdown_hidden_input.vue
'
;
...
...
@@ -106,6 +107,7 @@
data
()
{
return
{
searchQuery
:
''
,
focusOnSearch
:
false
,
};
},
computed
:
{
...
...
@@ -141,6 +143,18 @@
return
itemsProp
(
this
.
selectedItems
,
this
.
valueProperty
).
join
(
'
,
'
);
},
},
mounted
()
{
$
(
this
.
$refs
.
dropdown
)
.
on
(
'
shown.bs.dropdown
'
,
()
=>
{
this
.
focusOnSearch
=
true
;
})
.
on
(
'
hidden.bs.dropdown
'
,
()
=>
{
this
.
focusOnSearch
=
false
;
});
},
beforeDestroy
()
{
$
(
this
.
$refs
.
dropdown
).
off
();
},
methods
:
{
getItemsOrEmptyList
()
{
return
this
.
items
||
[];
...
...
@@ -170,7 +184,7 @@
<
template
>
<div>
<div
class=
"js-gcp-machine-type-dropdown
dropdown"
>
<div
ref=
"dropdown"
class=
"
dropdown"
>
<dropdown-hidden-input
:name=
"fieldName"
:value=
"selectedItemsValues"
/>
<dropdown-button
:class=
"
{ 'border-danger': hasErrors }"
...
...
@@ -179,7 +193,11 @@
:toggle-text="toggleText"
/>
<div
class=
"dropdown-menu dropdown-select"
>
<dropdown-search-input
v-model=
"searchQuery"
:placeholder-text=
"searchFieldPlaceholder"
/>
<dropdown-search-input
v-model=
"searchQuery"
:focused=
"focusOnSearch"
:placeholder-text=
"searchFieldPlaceholder"
/>
<div
class=
"dropdown-content"
>
<ul>
<li
v-if=
"!results.length"
>
...
...
app/assets/javascripts/jobs/components/sidebar.vue
View file @
b8eb0425
<
script
>
import
{
__
,
sprintf
}
from
'
~/locale
'
;
import
_
from
'
underscore
'
;
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
GlLink
,
GlButton
}
from
'
@gitlab/ui
'
;
...
...
@@ -3,6 +2,7 @@
import
_
from
'
underscore
'
;
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
GlLink
,
GlButton
}
from
'
@gitlab/ui
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
import
timeagoMixin
from
'
~/vue_shared/mixins/timeago
'
;
import
{
timeIntervalInWords
}
from
'
~/lib/utils/datetime_utility
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
...
...
app/assets/javascripts/jobs/components/trigger_block.vue
View file @
b8eb0425
<
script
>
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
...
...
@@ -2,5 +3,4 @@
import
{
__
}
from
'
~/locale
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
const
HIDDEN_VALUE
=
'
••••••
'
;
...
...
app/assets/javascripts/monitoring/components/charts/time_series.vue
View file @
b8eb0425
<
script
>
import
{
s__
,
__
}
from
'
~/locale
'
;
import
_
from
'
underscore
'
;
import
{
GlLink
,
GlButton
,
GlTooltip
,
GlResizeObserverDirective
}
from
'
@gitlab/ui
'
;
import
{
GlAreaChart
,
GlLineChart
,
GlChartSeriesLabel
}
from
'
@gitlab/ui/dist/charts
'
;
import
dateFormat
from
'
dateformat
'
;
...
...
@@ -3,7 +2,8 @@
import
_
from
'
underscore
'
;
import
{
GlLink
,
GlButton
,
GlTooltip
,
GlResizeObserverDirective
}
from
'
@gitlab/ui
'
;
import
{
GlAreaChart
,
GlLineChart
,
GlChartSeriesLabel
}
from
'
@gitlab/ui/dist/charts
'
;
import
dateFormat
from
'
dateformat
'
;
import
{
s__
,
__
}
from
'
~/locale
'
;
import
{
roundOffFloat
}
from
'
~/lib/utils/common_utils
'
;
import
{
getSvgIconPathContent
}
from
'
~/lib/utils/icon_utils
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
...
...
app/assets/javascripts/monitoring/components/date_time_picker/date_time_picker_input.vue
View file @
b8eb0425
<
script
>
import
_
from
'
underscore
'
;
import
{
GlFormGroup
,
GlFormInput
}
from
'
@gitlab/ui
'
;
import
{
s__
,
sprintf
}
from
'
~/locale
'
;
...
...
@@ -3,5 +4,4 @@
import
{
s__
,
sprintf
}
from
'
~/locale
'
;
import
{
GlFormGroup
,
GlFormInput
}
from
'
@gitlab/ui
'
;
import
{
dateFormats
}
from
'
~/monitoring/constants
'
;
const
inputGroupText
=
{
...
...
app/assets/javascripts/monitoring/components/embed.vue
View file @
b8eb0425
<
script
>
import
{
mapActions
,
mapState
,
mapGetters
}
from
'
vuex
'
;
import
PanelType
from
'
ee_else_ce/monitoring/components/panel_type.vue
'
;
import
{
getParameterValues
,
removeParams
}
from
'
~/lib/utils/url_utility
'
;
...
...
@@ -3,5 +4,4 @@
import
{
getParameterValues
,
removeParams
}
from
'
~/lib/utils/url_utility
'
;
import
PanelType
from
'
ee_else_ce/monitoring/components/panel_type.vue
'
;
import
GraphGroup
from
'
./graph_group.vue
'
;
import
{
sidebarAnimationDuration
}
from
'
../constants
'
;
import
{
getTimeDiff
}
from
'
../utils
'
;
...
...
app/assets/javascripts/monitoring/components/empty_state.vue
View file @
b8eb0425
<
script
>
import
{
GlEmptyState
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
...
...
@@ -2,5 +3,4 @@
import
{
__
}
from
'
~/locale
'
;
import
{
GlEmptyState
}
from
'
@gitlab/ui
'
;
export
default
{
components
:
{
...
...
app/assets/javascripts/monitoring/components/panel_type.vue
View file @
b8eb0425
<
script
>
import
{
mapState
}
from
'
vuex
'
;
import
_
from
'
underscore
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
GlDropdown
,
GlDropdownItem
,
...
...
@@ -9,6 +8,7 @@
GlModalDirective
,
GlTooltipDirective
,
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
MonitorTimeSeriesChart
from
'
./charts/time_series.vue
'
;
import
MonitorAnomalyChart
from
'
./charts/anomaly.vue
'
;
...
...
app/assets/javascripts/monitoring/monitoring_bundle.js
View file @
b8eb0425
import
Vue
from
'
vue
'
;
import
{
GlToast
}
from
'
@gitlab/ui
'
;
import
Dashboard
from
'
ee_else_ce/monitoring/components/dashboard.vue
'
;
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
{
getParameterValues
}
from
'
~/lib/utils/url_utility
'
;
...
...
@@ -3,6 +4,5 @@
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
{
getParameterValues
}
from
'
~/lib/utils/url_utility
'
;
import
Dashboard
from
'
ee_else_ce/monitoring/components/dashboard.vue
'
;
import
store
from
'
./stores
'
;
Vue
.
use
(
GlToast
);
...
...
app/assets/javascripts/notes.js
View file @
b8eb0425
...
...
@@ -16,4 +16,6 @@
import
Autosize
from
'
autosize
'
;
import
'
jquery.caret
'
;
// required by at.js
import
'
at.js
'
;
import
Vue
from
'
vue
'
;
import
{
GlSkeletonLoading
}
from
'
@gitlab/ui
'
;
import
AjaxCache
from
'
~/lib/utils/ajax_cache
'
;
...
...
@@ -19,3 +21,2 @@
import
AjaxCache
from
'
~/lib/utils/ajax_cache
'
;
import
Vue
from
'
vue
'
;
import
syntaxHighlight
from
'
~/syntax_highlight
'
;
...
...
@@ -21,5 +22,4 @@
import
syntaxHighlight
from
'
~/syntax_highlight
'
;
import
{
GlSkeletonLoading
}
from
'
@gitlab/ui
'
;
import
axios
from
'
./lib/utils/axios_utils
'
;
import
{
getLocationHash
}
from
'
./lib/utils/url_utility
'
;
import
Flash
from
'
./flash
'
;
...
...
app/assets/javascripts/notes/components/diff_with_note.vue
View file @
b8eb0425
<
script
>
/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
GlSkeletonLoading
}
from
'
@gitlab/ui
'
;
import
DiffFileHeader
from
'
~/diffs/components/diff_file_header.vue
'
;
import
DiffViewer
from
'
~/vue_shared/components/diff_viewer/diff_viewer.vue
'
;
import
ImageDiffOverlay
from
'
~/diffs/components/image_diff_overlay.vue
'
;
...
...
@@ -4,7 +5,6 @@
import
DiffFileHeader
from
'
~/diffs/components/diff_file_header.vue
'
;
import
DiffViewer
from
'
~/vue_shared/components/diff_viewer/diff_viewer.vue
'
;
import
ImageDiffOverlay
from
'
~/diffs/components/image_diff_overlay.vue
'
;
import
{
GlSkeletonLoading
}
from
'
@gitlab/ui
'
;
import
{
getDiffMode
}
from
'
~/diffs/store/utils
'
;
import
{
diffViewerModes
}
from
'
~/ide/constants
'
;
...
...
app/assets/javascripts/notes/components/discussion_jump_to_next_button.vue
View file @
b8eb0425
<
script
>
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
...
...
@@ -2,5 +3,4 @@
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
export
default
{
name
:
'
JumpToNextDiscussionButton
'
,
...
...
app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue
View file @
b8eb0425
<
script
>
import
{
GlTooltipDirective
,
GlButton
}
from
'
@gitlab/ui
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
...
...
@@ -2,5 +3,4 @@
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
{
GlTooltipDirective
,
GlButton
}
from
'
@gitlab/ui
'
;
export
default
{
name
:
'
ResolveWithIssueButton
'
,
...
...
app/assets/javascripts/notes/components/note_actions.vue
View file @
b8eb0425
<
script
>
import
{
mapGetters
}
from
'
vuex
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
{
GlLoadingIcon
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
resolvedStatusMixin
from
'
ee_else_ce/batch_comments/mixins/resolved_status
'
;
...
...
@@ -4,5 +3,6 @@
import
{
GlLoadingIcon
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
resolvedStatusMixin
from
'
ee_else_ce/batch_comments/mixins/resolved_status
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
ReplyButton
from
'
./note_actions/reply_button.vue
'
;
export
default
{
...
...
app/assets/javascripts/notes/components/note_form.vue
View file @
b8eb0425
<
script
>
import
{
mergeUrlParams
}
from
'
~/lib/utils/url_utility
'
;
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
noteFormMixin
from
'
ee_else_ce/notes/mixins/note_form
'
;
...
...
@@ -3,5 +2,6 @@
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
noteFormMixin
from
'
ee_else_ce/notes/mixins/note_form
'
;
import
{
mergeUrlParams
}
from
'
~/lib/utils/url_utility
'
;
import
eventHub
from
'
../event_hub
'
;
import
issueWarning
from
'
../../vue_shared/components/issue/issue_warning.vue
'
;
import
markdownField
from
'
../../vue_shared/components/markdown/field.vue
'
;
...
...
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
b8eb0425
<
script
>
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
diffLineNoteFormMixin
from
'
ee_else_ce/notes/mixins/diff_line_note_form
'
;
import
{
s__
,
__
}
from
'
~/locale
'
;
import
{
clearDraft
,
getDiscussionReplyKey
}
from
'
~/lib/utils/autosave
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
...
...
@@ -4,7 +5,6 @@
import
{
s__
,
__
}
from
'
~/locale
'
;
import
{
clearDraft
,
getDiscussionReplyKey
}
from
'
~/lib/utils/autosave
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
diffLineNoteFormMixin
from
'
ee_else_ce/notes/mixins/diff_line_note_form
'
;
import
TimelineEntryItem
from
'
~/vue_shared/components/notes/timeline_entry_item.vue
'
;
import
Flash
from
'
../../flash
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
...
...
app/assets/javascripts/notes/components/noteable_note.vue
View file @
b8eb0425
...
...
@@ -2,5 +2,6 @@
import
$
from
'
jquery
'
;
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
escape
}
from
'
underscore
'
;
import
draftMixin
from
'
ee_else_ce/notes/mixins/draft
'
;
import
{
truncateSha
}
from
'
~/lib/utils/text_utility
'
;
import
TimelineEntryItem
from
'
~/vue_shared/components/notes/timeline_entry_item.vue
'
;
...
...
@@ -5,6 +6,5 @@
import
{
truncateSha
}
from
'
~/lib/utils/text_utility
'
;
import
TimelineEntryItem
from
'
~/vue_shared/components/notes/timeline_entry_item.vue
'
;
import
draftMixin
from
'
ee_else_ce/notes/mixins/draft
'
;
import
{
__
,
s__
,
sprintf
}
from
'
../../locale
'
;
import
Flash
from
'
../../flash
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
...
...
app/assets/javascripts/notes/components/notes_app.vue
View file @
b8eb0425
<
script
>
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
getLocationHash
,
doesHashExistInUrl
}
from
'
../../lib/utils/url_utility
'
;
import
Flash
from
'
../../flash
'
;
import
*
as
constants
from
'
../constants
'
;
...
...
@@ -14,6 +13,7 @@
import
placeholderSystemNote
from
'
../../vue_shared/components/notes/placeholder_system_note.vue
'
;
import
skeletonLoadingContainer
from
'
../../vue_shared/components/notes/skeleton_note.vue
'
;
import
highlightCurrentUser
from
'
~/behaviors/markdown/highlight_current_user
'
;
import
{
__
}
from
'
~/locale
'
;
import
initUserPopovers
from
'
../../user_popovers
'
;
export
default
{
...
...
app/assets/javascripts/notes/stores/actions.js
View file @
b8eb0425
import
Vue
from
'
vue
'
;
import
$
from
'
jquery
'
;
import
Visibility
from
'
visibilityjs
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
...
...
@@ -3,5 +4,4 @@
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
Visibility
from
'
visibilityjs
'
;
import
TaskList
from
'
../../task_list
'
;
import
Flash
from
'
../../flash
'
;
import
Poll
from
'
../../lib/utils/poll
'
;
...
...
Prev
1
2
3
4
5
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment