summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared/components
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-03-01 09:45:33 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-03-01 09:45:33 +0000
commitbac9bb1866f47f0b1515b8705ea9eba1fa9b9ced (patch)
treefb04e4a16c32e55240906818d5f4d308d5092227 /app/assets/javascripts/vue_shared/components
parent2c4f5d30fc0fcc88ab97572068255b6a171a853e (diff)
parentadd8a3081ac3415697f9f3006ddfe4557bf090cc (diff)
downloadgitlab-ce-bac9bb1866f47f0b1515b8705ea9eba1fa9b9ced.tar.gz
Merge branch 'ee-3727-epic-labels-backport' into 'master'
CE Platform port for EE epics filtered search changes See merge request gitlab-org/gitlab-ce!17445
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
-rw-r--r--app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue b/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
index 1413dd69f24..3fcacd156c5 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
@@ -14,6 +14,11 @@
collapsedCalendarIcon,
},
props: {
+ blockClass: {
+ type: String,
+ required: false,
+ default: '',
+ },
collapsed: {
type: Boolean,
required: false,
@@ -91,7 +96,10 @@
</script>
<template>
- <div class="block">
+ <div
+ class="block"
+ :class="blockClass"
+ >
<div class="issuable-sidebar-header">
<toggle-sidebar
:collapsed="collapsed"