-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Formalize holidays and time off policy #120
Merged
Merged
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b618208
Create holidays.md
dcwalk c1aab2c
Update SUMMARY.md
dcwalk 8afa73d
restructure to finance section
dcwalk 45d354e
fix link to finance
dcwalk 2acfe87
Added pending concurrency config.
patcon 14f698b
Moved to using html-proofer fork until upstream merge happens.
patcon 2019cee
Removed misplaced typhoeus config.
patcon 6179071
Added slow version of html-proofer run. Documentation.
patcon 824bf42
Update holidays.md
patcon b85b53a
Update README.md
patcon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,4 +42,4 @@ jobs: | |
bundle install | ||
|
||
- name: Test the HTML | ||
run: make check | ||
run: make check-cautious |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,7 @@ | ||
source "https://rubygems.org" | ||
|
||
gem "html-proofer" | ||
gem "html-proofer", | ||
# Temporary fork to allow concurrency to be set via CLI. | ||
# See: https://github.com/gjtorikian/html-proofer/pull/632 | ||
github: "patcon/html-proofer", | ||
ref: "patch-1" |
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# Holidays, Time Off, and Leaves | ||
|
||
### Public and Additional Holidays | ||
|
||
Our virtual office is closed during [Ontario's nine public holidays](https://www.ontario.ca/document/your-guide-employment-standards-act-0/public-holidays) | ||
and member-workers are entitled (encouraged) to those days off and receive an [annualized public holiday pay](finance.md#public-holiday-pay). | ||
We recognize three additional holidays where the office is closed and members are encouraged not to work: | ||
Civic Holiday (first Monday in August), May Day or International Workers' Day (May 1), and Remembrance Day (November 11). | ||
During December Holidays the virtual office is closed for roughly two weeks. | ||
|
||
In cases where members choose to work on these days, or under special circumstances where a project requires, | ||
they will receive [regular wages](/finance.md#public-holiday-pay) for those hours and are entitled to take substitute time off. | ||
|
||
| **Holiday** | **2020** | **2021** | **202** | | ||
|--------------------------------------------------|-------------------|-------------------|------------------| | ||
| New Year's Day<br />January 1 | Wed, January 1 | Fri, January 1 | Sat, January 1 | | ||
| Ontario Family Day<br />Third Monday in February | Mon, February 17 | Mon, February 15 | Mon, February 21 | | ||
| Good Friday<br />Friday before Easter Sunday | Fri, April 10 | Fri, April 2 | Fri, April 15 | | ||
| May Day (International Workers' Day)<br />May 1 | Friday, May 1 | Saturday, May 1 | Sunday, May 1 | | ||
| Victoria Day<br />Monday before May 25 | Mon, May 18 | Mon, May 24 | Mon, May 23 | | ||
| Canada Day<br />July 1 | Wed, July 1 | Thu, July 1 | Fri, July 1 | | ||
| Civic Holiday<br />First Monday in August | Mon, August 3 | Mon, August 2 | Mon, August 1 | | ||
| Labour Day<br />First Monday in September | Mon, September 7 | Mon, September 6 | Mon, September 5 | | ||
| Thanksgiving<br />Second Monday in October | Mon, October 12 | Mon, October 11 | Mon, October 10 | | ||
| Remembrance Day<br />November 11 | Wed, November 11 | Thu, November 11 | Fri, November 11 | | ||
| Christmas Day<br />December 25 | Fri, December 25 | Sat, December 25 | Sun, December 25 | | ||
| Boxing Day<br />December 26 | Sat, December 26 | Sun, December 26 | Mon, December 26 | | ||
|
||
### Sick Days, Personal Time Off, and Leaves of Absense | ||
|
||
We have no policy limiting the number of sick days, time-off, or leaves that members take. | ||
However, we recognize taking any of the above has to be balanced against existing deadlines and commitments. | ||
|
||
Member-workers should notify Operations as soon as possible by email: [[email protected]](mailto:[email protected]), | ||
with any planned or unplanned time off. |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel a little cautious about this approach
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, def remove it then. i've shared my logic, and totes your call
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wait, no, i thought this was something else.
Sorry, why feeling cautious? This is the self-documenting way I understand folks use package managers when waiting for upstream changes to get merged, and i'm not sure how else one goes about it... waiting on upstream to merge months later is not an approach I'm familiar with. Would forking to hyphacoop org feel more solid?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you want to hold off a bit longer, it will prob be merged in the next week: gjtorikian/html-proofer#632 (comment)
But merging stuff like this from in-process forks is totally par for the course in past positions I've worked at, and isn't usually considered a "code smell". It's just a house-keeping task to go through the manifest file every few months or so and sweep forks back to mainline or poke PR's along :)