Merge branch 'master' into release-bump-4.1.0

mattermost · Dec 22, 2023 · 31fc66f · 31fc66f
2 parents 793354f + 9950c0e
commit 31fc66f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/server/client_cloud.go b/server/client_cloud.go
@@ -107,11 +107,12 @@ func (client jiraCloudClient) ListProjects(query string, limit int, expandIssueT
 			result.Values = result.Values[:remaining]
 		}
 		out = append(out, result.Values...)
-		remaining -= len(result.Values)
-
-		if !fetchAll && remaining == 0 {
-			// Got enough.
-			return out, nil
+		if !fetchAll {
+			remaining -= len(result.Values)
+			if remaining == 0 {
+				// Got enough.
+				return out, nil
+			}
 		}
 		if len(result.Values) == 0 || result.IsLast {
 			// Ran out of results.