diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-09 15:07:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-09 15:07:48 +0300 |
| commit | 7c41737ae53e3a237f356480ae04ec3ba182447b (patch) | |
| tree | 766189eea19b2d44460a7e77dae19cd0b43d24f2 /app/assets/javascripts/analytics | |
| parent | 44d4b37b52c678a0b6a3c18c8c87319553ce84a3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/analytics')
| -rw-r--r-- | app/assets/javascripts/analytics/shared/components/daterange.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/analytics/shared/components/daterange.vue b/app/assets/javascripts/analytics/shared/components/daterange.vue index e9a4debdbb3..a14b0bafecf 100644 --- a/app/assets/javascripts/analytics/shared/components/daterange.vue +++ b/app/assets/javascripts/analytics/shared/components/daterange.vue @@ -89,6 +89,8 @@ export default { :default-max-date="maxDate" :same-day-selection="includeSelectedDate" :tooltip="maxDateRangeTooltip" + :from-label="__('From')" + :to-label="__('To')" theme="animate-picker" start-picker-class="js-daterange-picker-from gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-lg-align-items-center gl-lg-mr-3 gl-mb-2 gl-lg-mb-0" end-picker-class="js-daterange-picker-to gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-lg-align-items-center gl-mb-2 gl-lg-mb-0" diff --git a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue index b2e554bc913..5bb60d91f1e 100644 --- a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue +++ b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue @@ -240,7 +240,7 @@ export default { </template> <template #header> <gl-dropdown-section-header>{{ __('Projects') }}</gl-dropdown-section-header> - <gl-search-box-by-type v-model.trim="searchTerm" /> + <gl-search-box-by-type v-model.trim="searchTerm" :placeholder="__('Search')" /> </template> <template #highlighted-items> <gl-dropdown-item |