diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 7d15d6796..5dd4950d6 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,4 +1,5 @@ # prettier cf5056d9c03b62d91a25c3b9127caac838695f98 -# prettier v2 (put here after fix/EE-2344/fix-eslint-issues is merged) \ No newline at end of file +# prettier v2 +42e7db0ae7897d3cb72b0ea1ecf57ee2dd694169 \ No newline at end of file diff --git a/.vscode.example/launch.json b/.vscode.example/launch.json index 1d0e1fd51..6c7e6315d 100644 --- a/.vscode.example/launch.json +++ b/.vscode.example/launch.json @@ -9,7 +9,7 @@ "type": "go", "request": "launch", "mode": "debug", - "program": "${workspaceRoot}/api/cmd/portainer/main.go", + "program": "${workspaceRoot}/api/cmd/portainer", "cwd": "${workspaceRoot}", "env": {}, "showLog": true, diff --git a/.vscode.example/settings.json b/.vscode.example/settings.json index 02620a62d..98da84fe8 100644 --- a/.vscode.example/settings.json +++ b/.vscode.example/settings.json @@ -4,5 +4,5 @@ "gopls": { "build.expandWorkspaceToModule": false }, - "gitlens.advanced.blame.customArguments": ["–ignore-revs-file", ".git-blame-ignore-revs"] + "gitlens.advanced.blame.customArguments": ["--ignore-revs-file", ".git-blame-ignore-revs"] }