[pull] main from hackclub:main#452
Merged
Merged
Conversation
## Summary of the problem <!-- Why are these changes being made? What problem does it solve? Link any related issues to provide more details. --> https://appsignal.com/hack-club/sites/6596247683eb67648f30f807/exceptions/incidents/1030/samples/timestamp/2026-06-09T14:52:45Z #13826 added a checkbox to exclude reimbursements in transfer admin pages, but introduced a SQL join that made ordering by `aasm_state` ambiguous. ## Describe your changes <!-- Explain your thought process to the solution and provide a quick summary of the changes. --> Specify the table name to make ordering by `aasm_state` unambiguous. <!-- If there are any visual changes, please attach images, videos, or gifs. -->
## Summary of the problem <!-- Why are these changes being made? What problem does it solve? Link any related issues to provide more details. --> #13862 added the "org" placeholder for event nav items except for settings, as it's currently handled outside of the event nav helper method due to it being a dropdown. We still need the placeholder for these links. ## Describe your changes <!-- Explain your thought process to the solution and provide a quick summary of the changes. --> Move the settings dropdown nav into the `NAV_ITEMS` array and helper method system, and add support for the org placeholder accessing dropdown nav items by flat mapping the array. <img width="1282" height="901" alt="image" src="https://github.com/user-attachments/assets/0bb5bae8-8ad0-46ee-8b86-d2ab3964fa00" /> <!-- If there are any visual changes, please attach images, videos, or gifs. --> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
## Summary of the problem <!-- Why are these changes being made? What problem does it solve? Link any related issues to provide more details. --> [`db892c4` (#11932)](db892c4) broke the HTML for removing a scoped tag in the suborg creation form - unfortunately ERB lint doesn't play nice with Alpine's `@` syntax. ## Describe your changes <!-- Explain your thought process to the solution and provide a quick summary of the changes. --> Fix the HTML and add the event handler back, using the ERB-lint friendly `x-on` syntax <!-- If there are any visual changes, please attach images, videos, or gifs. --> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )