Skip to content

Commit 9458a42

Browse files
authored
Merge branch 'hackclub:main' into main
2 parents 7ee715d + 8522c5f commit 9458a42

File tree

4 files changed

+11
-17
lines changed

4 files changed

+11
-17
lines changed

app/views/admin/design_reviews/index.html.erb

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,8 @@
102102
start_time = nil
103103

104104
if project.respond_to?(:versions)
105-
version = project.versions.where(event: "update")
106-
.where("object_changes ->> 'review_status' ILIKE '%design_pending%'")
107-
.order(created_at: :desc)
108-
.first
109-
start_time = version.created_at if version
105+
events = attribute_updated_event(object: project, attribute: :review_status, after: "design_pending", all: true)
106+
start_time = events.last[:timestamp] if events.present?
110107
end
111108
%>
112109

app/views/home/_announcements.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<% announcements = [
22
{
3-
title: "Slack is unavailable",
4-
date: "November 24, 2025",
5-
content: "If you need support or have questions, please contact us at [email protected].",
3+
title: "Due date for Prototype",
4+
date: "December 5, 2025",
5+
content: "This is the last day to qualify for Prototype!",
66
level: :dark
77
}
88
]%>

config/initializers/ahoy.rb

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
class Ahoy::Store < Ahoy::DatabaseStore
22
def track_visit(data)
33
data[:ip] = request.headers["CF-Connecting-IP"] || request.remote_ip
4-
5-
if request.session[:user_id] == 1
6-
begin
7-
Sentry.capture_message("Ahoy Headers for User 1", extra: { headers: request.headers.to_h })
8-
rescue => e
9-
Sentry.capture_exception(e)
10-
end
11-
end
12-
134
super(data)
145
end
156
end

docs/hackpad/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,4 +441,10 @@ The board should automatically restart and be recognised as a new external drive
441441
# Next steps
442442
We just made a pretty cool macropad, but obviously there's a lot of cooler stuff out there - that's up to you to figure out! Again, don't copy this guide 1:1, add your own design into it.
443443

444+
445+
---
446+
447+
Want some resources and tips? [Check this out!](/hackpad/resources)
448+
444449
Or maybe do you think you are done? Check out how to submit [here](/hackpad/submitting)
450+

0 commit comments

Comments
 (0)