Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 1 deletions

diff --git a/app/assets/javascripts/boards/boards_util.js b/app/assets/javascripts/boards/boards_util.js
index e5ff41dab74..04ca65b4a8b 100644
--- a/app/assets/javascripts/boards/boards_util.js
+++ b/app/assets/javascripts/boards/boards_util.js
@@ -83,6 +83,10 @@ export function fullBoardId(boardId) {
   return `gid://gitlab/Board/${boardId}`;
 }
 
+export function fullIterationId(id) {
+  return `gid://gitlab/Iteration/${id}`;
+}
+
 export function fullLabelId(label) {
   if (label.project_id !== null) {
     return `gid://gitlab/ProjectLabel/${label.id}`;
@@ -141,6 +145,7 @@ export default {
   formatListIssues,
   fullBoardId,
   fullLabelId,
+  fullIterationId,
   getBoardsPath,
   isListDraggable,
 };
diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue
index dab934352ca..7507874e951 100644
--- a/app/assets/javascripts/boards/components/board_form.vue
+++ b/app/assets/javascripts/boards/components/board_form.vue
@@ -15,6 +15,7 @@ const boardDefaults = {
   name: '',
   labels: [],
   milestone_id: undefined,
+  iteration_id: undefined,
   assignee: {},
   assignee_id: undefined,
   weight: null,
@@ -171,6 +172,9 @@ export default {
     }
   },
   methods: {
+    setIteration(iterationId) {
+      this.board.iteration_id = iterationId;
+    },
     callBoardMutation(id) {
       return this.$apollo.mutate({
         mutation: createBoardMutation,
@@ -289,6 +293,7 @@ export default {
         :project-id="projectId"
         :group-id="groupId"
         :weights="weights"
+        @set-iteration="setIteration"
       />
     </form>
   </gl-modal>
diff --git a/app/assets/javascripts/boards/graphql/board.mutation.graphql b/app/assets/javascripts/boards/graphql/board.mutation.graphql
index ef2b81a7939..fc3bb2285ee 100644
--- a/app/assets/javascripts/boards/graphql/board.mutation.graphql
+++ b/app/assets/javascripts/boards/graphql/board.mutation.graphql
@@ -1,4 +1,4 @@
-mutation UpdateBoard($id: ID!, $hideClosedList: Boolean, $hideBacklogList: Boolean) {
+mutation UpdateBoard($id: BoardID!, $hideClosedList: Boolean, $hideBacklogList: Boolean) {
   updateBoard(
     input: { id: $id, hideClosedList: $hideClosedList, hideBacklogList: $hideBacklogList }
   ) {