merge main into staging #20
Merged
Conversation
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
The default branch has been renamed to `main`, and dependabot's target branch has been set to `staging`.
|
Do we want to disable the docker workflow when merging from master into other branches? |
|
I'll work on making a workflow that automatically merges master back into staging so that we don't have to keep doing this |
|
slay that's exactly what we need |
|
actually we should never have to merge master back into staging as long as we never merge to master directly except though staging |
|
master will always be behind staging |
|
that is my idea, however, on the off chance it happens, it would be kinda nice. also, I'm gonna work on contributing guidelines that will lay that out, as well as branch naming guidelines, issue/pr templates, etc |
|
Sounds good. Github won't let me approve since main is behind staging |
nathen418
added a commit
that referenced
this pull request
Sep 7, 2022
## New in version 2.2.1 - Many more bugfixes, dependency updates - Added contributing standards and pull request templates - Added interfaces and strong typing to all database calls - Updated workflows to work on the correct branches - Refined branch protection rules to make collaboration easier ## Merged Pull Requests * Update README.md by @nathen418 in #14 * Create dependabot.yml by @nathen418 in #15 * Bump chalk from 4.1.2 to 5.0.1 by @dependabot in #18 * Bump mongoose from 6.5.3 to 6.5.4 by @dependabot in #16 * Nathen418/update dependabot by @nathen418 in #19 * merge main into staging by @nathen418 in #20 * update what branches workflows to run on correct branches and triggers by @schiltz3 in #24 * Add Contributing Standards by @nathen418 in #25 * PR template by @schiltz3 in #26 * Add interfaces for models by @schiltz3 in #22 * Fix bug in `addNewRole` by @schiltz3 in #29 * Bugfix/schiltz3/deepsource by @schiltz3 in #28 ## New Contributors * @dependabot made their first contribution in #18 **Full Changelog**: v2.2.0...v2.2.1
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.
No description provided.