diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-08 06:11:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-08 06:11:43 +0300 |
| commit | d27e35761a665e32a7a83fc76ca19613a7a1c7bb (patch) | |
| tree | 86bc18976e18988a0ab7576f5e81f024c2b76ebb /app | |
| parent | 61f4111a853b8bb50f10fbd7854a8796be7eca24 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/boards/boards_util.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/graphql/lists_issues.query.graphql | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/boards_util.js b/app/assets/javascripts/boards/boards_util.js index 8c248d41c8e..c10241d00d7 100644 --- a/app/assets/javascripts/boards/boards_util.js +++ b/app/assets/javascripts/boards/boards_util.js @@ -43,7 +43,9 @@ export function formatListIssues(listIssues) { let sortedIssues = list.issues.edges.map((issueNode) => ({ ...issueNode.node, })); - sortedIssues = sortBy(sortedIssues, 'relativePosition'); + if (list.listType !== ListType.closed) { + sortedIssues = sortBy(sortedIssues, 'relativePosition'); + } return { ...map, diff --git a/app/assets/javascripts/boards/graphql/lists_issues.query.graphql b/app/assets/javascripts/boards/graphql/lists_issues.query.graphql index d1cb1ecf834..787dd77b901 100644 --- a/app/assets/javascripts/boards/graphql/lists_issues.query.graphql +++ b/app/assets/javascripts/boards/graphql/lists_issues.query.graphql @@ -16,6 +16,7 @@ query ListIssues( nodes { id issuesCount + listType issues(first: $first, filters: $filters, after: $after) { edges { node { @@ -37,6 +38,7 @@ query ListIssues( nodes { id issuesCount + listType issues(first: $first, filters: $filters, after: $after) { edges { node { |