Skip to content

Commit

Permalink
Merge branch 'release/1.2.9' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Serhioromano committed Mar 7, 2022
2 parents 1dee7be + 95c49ba commit 56a06fd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to the "gitflow" extension will be documented in this file.

## [1.2.9] 02/07/2022

- security - fix string sanitization

## [1.2.8] 03/07/22

- fix - stop command on ESC.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vscode-gitflow",
"displayName": "Git Flow",
"description": "Git-Flow support for VS Code",
"version": "1.2.8",
"version": "1.2.9",
"engines": {
"vscode": "^1.64.0"
},
Expand Down Expand Up @@ -46,7 +46,6 @@
"url": "https://github.com/Serhioromano/vscode-gitflow"
},
"homepage": "https://marketplace.visualstudio.com/items?itemName=serhioromano.vscode-gitflow",
"main": "./out/main.js",
"contributes": {
"configuration": {
"title": "GitFlow",
Expand Down Expand Up @@ -725,6 +724,7 @@
]
}
},
"main": "./out/main.js",
"scripts": {
"vscode:prepublish": "npm run esbuild-base -- --minify",
"esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
Expand Down
2 changes: 1 addition & 1 deletion src/ViewBranches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ export class TreeViewBranches implements vscode.TreeDataProvider<Flow> {
if (msg === undefined) {
return;
}
msg = `${msg}`.replace("\"", "'").trim();
msg = `${msg}`.trim();
if (msg === "") {
msg = `Finish ${ucf(feature)}: ${name}`;
}
Expand Down

0 comments on commit 56a06fd

Please sign in to comment.