Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mrnicegyu11/osparc-simcore
Browse files Browse the repository at this point in the history
  • Loading branch information
Dustin Kaiser committed Dec 1, 2021
2 parents 2742082 + 71115b5 commit 554729e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 9 deletions.
13 changes: 13 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ Consider prefix your PR message with an emoticon
or from https://gitmoji.dev/
and append (⚠️ devops) if changes in devops configuration required before deploying
Use the following github labels to tag your PR for github's automatic changelog generation:
changelog:ignore-for-release
changelog:✨new-feature
changelog:🎨enhancement
changelog:♻️refactor
changelog:🐛bugfix
changelog:🔒️security
changelog:🔥removal
changelog:⚰️deprecation
changelog:⚠️devops
-->

## What do these changes do?
Expand Down
16 changes: 9 additions & 7 deletions .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,18 @@ changelog:
categories:
- Added: ✨ New Features
labels:
- changelog:new-feature
- changelog:new-feature
- Changed: ♻️ Changed and Improved Functionalities
labels:
- changelog:enhancement
- changelog:refactor
- changelog:🎨enhancement
- changelog:♻️refactor
- Fixed: 🐛 Bugfixes and Security Improvements
labels:
- changelog:bugfix
- changelog:security
- changelog:🐛bugfix
- changelog:🔒️security
- Removed: 🔥 Removed and Deprecated Features
labels:
- changelog:removal
- changelog:deprecation
- changelog:🔥removal
- changelog:⚰️deprecation
- DevOps: Needs changes in the deployment's Ops-Pipeline
- changelog:⚠️devops
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,5 +196,3 @@ https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
#


#This is a test line by DK. Purpose is to check CI workflow.

0 comments on commit 554729e

Please sign in to comment.