Skip to content

[pull] main from hackclub:main#448

Merged
pull[bot] merged 5 commits into
jaspermayone-forks:mainfrom
hackclub:main
Jun 10, 2026
Merged

[pull] main from hackclub:main#448
pull[bot] merged 5 commits into
jaspermayone-forks:mainfrom
hackclub:main

Conversation

@pull

@pull pull Bot commented Jun 10, 2026

Copy link
Copy Markdown

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 : )

polypixeldev and others added 5 commits June 9, 2026 19:32
## Summary of the problem
<!-- Why are these changes being made? What problem does it solve? Link
any related issues to provide more details. -->
We want to make it clear to users what to expect with application review
times. Plus, it'd be good to have a single OOO callout partial that we
can update whenever we have a special case (such as FIRST worlds).

## Describe your changes
<!-- Explain your thought process to the solution and provide a quick
summary of the changes. -->
Refactored the OOO callout to be a single partial (without the FIRST
worlds code since that's over), and add it to the application status
page if the user is awaiting review.

<img width="988" height="586" alt="image"
src="https://github.com/user-attachments/assets/e03f21ad-7204-4066-ba48-75412b241d45"
/>
#13782)

## Summary of the problem
<!-- Why are these changes being made? What problem does it solve? Link
any related issues to provide more details. -->
#13780 turned off the `include_all_helpers` Rails config - but this
doesn't only stop our helpers from being included, it also stopped
external helpers from being automatically included. In our case, the
only external helper we used that was not included was
`LocalTimeHelper`.

Additionally, since the API v4 controller doesn't inherit from
ApplicationController, it does not automatically include the main
ApplicationHelper. While I don't think that v4 views currently use any
helper methods of the main ApplicationHelper other than those from the
helper modules it already explicitly included, I'm not 100% sure and it
makes sense that they should be available. In the future, we can decide
whether we want to limit the helper methods v4 has access to.

## Describe your changes
<!-- Explain your thought process to the solution and provide a quick
summary of the changes. -->
Reapply #13780, include `LocalTimeHelper`, and include the main
ApplicationHelper in v4 ApplicationHelper (the main ApplicationHelper
includes the modules that v4 ApplicationHelper was explicitly
including).

<!-- 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. -->
It'd be helpful if we can link to something like
hcb.hackclub.com/org/transfers where the user can select the
organization they want, instead of having to provide written
instructions or a GIF to show users how to get to a specific page.

## Describe your changes
<!-- Explain your thought process to the solution and provide a quick
summary of the changes. -->
Refactors the `events_nav` method in `EventsHelper` to pull from a
constant array of nav items. `SetEvent` then checks if the event slug is
"org", matches the route against the available nav items, and displays
the available events along with what the user will be continuing to.

<img width="1495" height="1048" alt="image"
src="https://github.com/user-attachments/assets/841980c0-8fd3-4051-ab45-de642466697b"
/>
<img width="1495" height="1048" alt="image"
src="https://github.com/user-attachments/assets/0aeee92f-e081-4cfd-838e-fd857234e7f5"
/>


<!-- If there are any visual changes, please attach images, videos, or
gifs. -->

---------

Co-authored-by: Gary Tou <gary@garytou.com>
## Summary of the problem
<!-- Why are these changes being made? What problem does it solve? Link
any related issues to provide more details. -->
#13812 removed the review_delay_callout partial being used for
applications, but only replaced it with the new callout on the show
page, not the review page.

## Describe your changes
<!-- Explain your thought process to the solution and provide a quick
summary of the changes. -->
Use the correct OOO callout on the application review page.

<!-- If there are any visual changes, please attach images, videos, or
gifs. -->
@pull pull Bot locked and limited conversation to collaborators Jun 10, 2026
@pull pull Bot added the ⤵️ pull label Jun 10, 2026
@pull pull Bot merged commit 402525a into jaspermayone-forks:main Jun 10, 2026
15 of 16 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant