Merge upstream #324
Merged
Merge upstream #324
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
- Add required <tr> within <thead> - Add implicit <tbody> after <thead>
🚨 [security] Update rack: 2.2.6.2 → 2.2.6.3 (patch)
Font Awesome icon elements are intended to be empty. Extending the icon elements around adjacent text caused the text to be displayed in an irregular font.
Incidentally fulfills the same need as #2662
Resolves failure to display initial help text of difficulty level.
Tracks are otherwise undocumented for CfP respondents.
🚨 [security] Update rack: 2.2.6.3 → 2.2.6.4 (patch)
Update tilt: 2.0.10 → 2.1.0 (minor)
Update cancancan: 3.3.0 → 3.5.0 (minor)
Update to latest ruby 3.1 version
The bundle does this already.
for more terse logging
Introduces lograge
🚨 [security] Update nokogiri: 1.14.0 → 1.14.3 (patch)
Update addressable: 2.8.0 → 2.8.3 (patch)
Update rqrcode: 2.1.1 → 2.1.2 (patch)
….0.1 Update omniauth-github: 2.0.0 → 2.0.1 (patch)
Update delayed_job: 4.1.10 → 4.1.11 (patch)
Display track description on event proposal form
cycomachead
commented
Feb 13, 2024
cycomachead
commented
Feb 13, 2024
| word_count($('#event_submission_text').get(0), 'submission-count', max); | ||
| }).trigger('change'); | ||
| } | ||
| $("#event_event_type_id").change(updateEventTypeRequirements); |
There was a problem hiding this comment.
Not sure if we should actually keep the word count for the #event_submission_text field.
cycomachead
commented
Feb 13, 2024
| @@ -26,8 +26,7 @@ class EventScheduleSerializer < ActiveModel::Serializer | |||
| attributes :date, :room | |||
|
|
|||
| def date | |||
| t = object.start_time | |||
| t.blank? ? '' : %( #{I18n.l t, format: :short}#{t.formatted_offset(false)} ) | |||
| object.start_time&.change(zone: object.event.program.conference.timezone) | |||
There was a problem hiding this comment.
I am not 100% of the implications of this change and the various timezone features.
cycomachead
commented
Feb 13, 2024
|
|
||
| def scheduled_date | ||
| t = object.time | ||
| t.blank? ? '' : %( #{I18n.l t, format: :short}#{t.formatted_offset(false)} ) | ||
| object.time&.change(zone: object.program.conference.timezone) |
There was a problem hiding this comment.
Same here, unsure of this. But seems fine.
|
OK, as of now, all files have been reviews. things seem OK. ...now to tackle the spec failures. |
This reverts commit c643872.
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.
Merge in recent-ish OSEM updates