forked from public-ui/kolibri
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/inputStyles
Refs: public-ui#6338
- Loading branch information
Showing
247 changed files
with
10,062 additions
and
4,569 deletions.
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 |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| /.husky/ | ||
| /.idea/ | ||
| /.nx/ | ||
| /license-reports/*.html | ||
|
|
||
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,46 @@ | ||
| #!/bin/sh | ||
|
|
||
| # | ||
| # Validate branch name and append the ticket ID (from branch name) to commit messages. | ||
| # Modified version of: https://medium.com/@adrian.garcia.estaun/add-the-ticket-id-to-your-commit-messages-automatically-2debfa0fbe9d | ||
| # | ||
|
|
||
| ERROR_MESSAGE="Error: Branch name does not start with a ticket ID. Format: ticketID-branch-description. E.g.: '1234-update-tests'" | ||
|
|
||
| # Gets the commit message received as parameter and the current branch name. | ||
| COMMIT_MSG_FILE="$1" | ||
| COMMIT_SOURCE="$2" | ||
|
|
||
| # Skip merge commits | ||
| if [ "$COMMIT_SOURCE" = merge ]; then | ||
| exit 0 | ||
| fi | ||
|
|
||
| message=$(cat "$COMMIT_MSG_FILE") | ||
| branchName=$(git symbolic-ref --short HEAD) | ||
|
|
||
| # Get the last part of the branch name. feature/foo/42-bugfix -> 42-bugfix | ||
| normalizedBranchName=$(echo "$branchName" | awk -F'/' '{print $NF}') | ||
|
|
||
| # Branch name starts with a ticket ID | ||
| if echo "$normalizedBranchName" | grep -qE '^[0-9]+[-_]'; then | ||
| # Get ticketID from branch name. Works with `-` or `_` as separator. 123-foobar -> 123 | ||
| ticketID=$(echo "$normalizedBranchName" | sed -nE 's,([0-9]+)[_-].+,\1,p') | ||
|
|
||
| if [ -z "$ticketID" ]; then | ||
| echo "$ERROR_MESSAGE" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Message already contains the ticket ID | ||
| if echo "$message" | grep -qE '#[0-9]+'; then | ||
| exit 0 | ||
| fi | ||
|
|
||
| output="$message"$'\n'$'\n'"Refs: #$ticketID" | ||
|
|
||
| echo "$output" > "$1" | ||
| else | ||
| echo "$ERROR_MESSAGE" | ||
| exit 1 | ||
| fi |
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 |
|---|---|---|
|
|
@@ -27,5 +27,5 @@ | |
| "packages/tools/visual-tests" | ||
| ], | ||
| "useNx": true, | ||
| "version": "2.0.12" | ||
| "version": "2.0.14" | ||
| } | ||
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
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
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
Oops, something went wrong.