Merge Staging Commits into Main #540
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* api and permsManager * enable eslint rule to check for promise use * added lint checking for promise misuse * fixed update-dev-db * disabled misused promise rule for api.ts * fixed import * fixed teamEvent typing issue * checks for document data * cast as document data * update candidateDecider * henry's comments --------- Co-authored-by: Henry Li <hl738@cornell.edu>
|
[diff-counting] Significant lines: 219. |
|
Found some weird issues going on while testing this out in the deployment preview: https://deploy-preview-540--cornelldti-idol.netlify.app/forms/shoutouts. Will check back on this later. |
oscarwang20
requested changes
Nov 12, 2023
| return ( | ||
| <Item.Group divided> | ||
| <Header className={styles.presentCount}> | ||
| <Image className={styles.presentCountImg} src={catEmoji.src} alt="cat gif" /> |
There was a problem hiding this comment.
It looks like the header with the catEmoji is showing in the ALL view instead of PRESENT view.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
I branched off of staging and realized we still have about 5 commits here that never made it into main.
The only notable merge conflict was the following:
Refactor admin shoutouts (#463)
conflicted with
Display count for shoutouts (#462)
@oscarwang20 The second one is your PR. Can you verify that the functionality is all still there?
Notion/Figma Link
Test Plan
Notes
Breaking Changes