diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 15:08:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-03 15:08:43 +0000 |
| commit | dbe0e5676267eb142dd8d81e4c881c997cb96962 (patch) | |
| tree | 765b50588c3c1540297dc6a76eea1122dd59cdac /app/assets/javascripts/sidebar | |
| parent | 14a32c2d551a646525b1fabd93cb70a0e6924478 (diff) | |
| download | gitlab-ce-dbe0e5676267eb142dd8d81e4c881c997cb96962.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
3 files changed, 14 insertions, 0 deletions
diff --git a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue index 77be8022ec0..891eaf07ac9 100644 --- a/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue +++ b/app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue @@ -54,6 +54,16 @@ export default { type: Boolean, default: false, }, + minDate: { + required: false, + type: Date, + default: null, + }, + maxDate: { + required: false, + type: Date, + default: null, + }, }, data() { return { @@ -292,6 +302,8 @@ export default { v-if="!isLoading" ref="datePicker" class="gl-relative" + :min-date="minDate" + :max-date="maxDate" :default-date="parsedDate" :first-day="firstDay" show-clear-button diff --git a/app/assets/javascripts/sidebar/queries/update_epic_due_date.mutation.graphql b/app/assets/javascripts/sidebar/queries/update_epic_due_date.mutation.graphql index 9b0a8b4a8f7..690eb75f8f4 100644 --- a/app/assets/javascripts/sidebar/queries/update_epic_due_date.mutation.graphql +++ b/app/assets/javascripts/sidebar/queries/update_epic_due_date.mutation.graphql @@ -4,6 +4,7 @@ mutation updateEpicDueDate($input: UpdateEpicInput!) { id dueDateIsFixed dueDateFixed + dueDate dueDateFromMilestones } errors diff --git a/app/assets/javascripts/sidebar/queries/update_epic_start_date.mutation.graphql b/app/assets/javascripts/sidebar/queries/update_epic_start_date.mutation.graphql index 9b4bb9159c3..d2a598a00fa 100644 --- a/app/assets/javascripts/sidebar/queries/update_epic_start_date.mutation.graphql +++ b/app/assets/javascripts/sidebar/queries/update_epic_start_date.mutation.graphql @@ -4,6 +4,7 @@ mutation updateEpicStartDate($input: UpdateEpicInput!) { id startDateIsFixed startDateFixed + startDate startDateFromMilestones } errors |