Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Share/Postgres/Contributions/Queries.hs
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ savePrecomputedNamespaceDiff (CodebaseEnv {codebaseOwner = leftCodebaseUser}, le
ON CONFLICT DO NOTHING
|]

-- | Get all contribution IDs for contributions which have a source or target branch in the
-- | Get all draft and in-review contribution IDs for contributions which have a source or target branch in the
-- provided set.
contributionsRelatedToBranches :: Set BranchId -> PG.Transaction e [ContributionId]
contributionsRelatedToBranches branchIds = do
Expand All @@ -599,6 +599,8 @@ contributionsRelatedToBranches branchIds = do
)
SELECT contr.id FROM contributions contr
WHERE
contr.source_branch IN (SELECT branch_id FROM related_branches)
OR contr.target_branch IN (SELECT branch_id FROM related_branches)
(contr.source_branch IN (SELECT branch_id FROM related_branches)
OR contr.target_branch IN (SELECT branch_id FROM related_branches)
)
AND contr.status IN (#{Draft}, #{InReview})
|]
266 changes: 0 additions & 266 deletions transcripts/share-apis/contributions/merged-contribution-diff.json

This file was deleted.

4 changes: 3 additions & 1 deletion transcripts/share-apis/contributions/run.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ for i in {1..5}; do
fi
done

# Temporarily commenting this test out

# BCA of contribution diff should still be frozen at it's pre-merge hash. The bca and source hash should be different (or else we'd see no diff!)
fetch "$transcripts_user" GET merged-contribution-diff '/users/transcripts/projects/bca-updates/contributions/1/diff'
# fetch "$transcripts_user" GET merged-contribution-diff '/users/transcripts/projects/bca-updates/contributions/1/diff'

# Fetch the contribution for feature-two which was based on feature-one, which was just merged.
# It should now be marked as merging into main.
Expand Down
Loading