From 993093ca4e3969928fa82180b8b43bbb175dafce Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Wed, 12 Dec 2018 22:34:57 +0100
Subject: [PATCH] CHANGELOG for v1.6.0

---
 CHANGELOG.md | 17 +++++++++++++++--
 package.json |  5 +++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f4754d..085d210 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## [1.6.0] - 2018-12-12
+### Added
+- Pipeline notification on the status bar will now include the list of running and failed jobs
+  - Implemented by [@jduponchelle](https://gitlab.com/jduponchelle)
+    - with [MR !23](https://gitlab.com/fatihacet/gitlab-vscode-extension/merge_requests/22)
+
+### Fixed
+- Refresh buttons on the sidebar were visible for all panes and even for other extensions.
+  - Fixed by [@Logerfo](https://gitlab.com/Logerfo)
+    - with [MR !26](https://gitlab.com/fatihacet/gitlab-vscode-extension/merge_requests/25)
+
+
 ## [1.5.1] - 2018-11-28
 ### Fixed
 - View in GitLab button in the pipeline updated notification was not visible
@@ -14,6 +26,7 @@
     - with [MR !22](https://gitlab.com/fatihacet/gitlab-vscode-extension/merge_requests/22)
     - closes [Issue #59](https://gitlab.com/fatihacet/gitlab-vscode-extension/issues/59)
 
+
 ## [1.4.0] - 2018-11-06
 ### Added
 - A new config option to toggle pipeline status change notifications [Read more](https://gitlab.com/fatihacet/gitlab-vscode-extension#configuration-options)
@@ -219,5 +232,5 @@
 
 ## [0.1.1] - 2018-01-25
 ### Added
-- Implemented show issues assinged to me.
-- Implemented show merge requests assinged to me.
+- Implemented show issues assigned to me.
+- Implemented show merge requests assigned to me.
diff --git a/package.json b/package.json
index 3ef86fb..a56e9ff 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "gitlab-workflow",
   "displayName": "GitLab Workflow",
   "description": "GitLab VSCode integration",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "publisher": "fatihacet",
   "license": "MIT",
   "repository": {
@@ -208,7 +208,8 @@
     "test": "node ./node_modules/vscode/bin/test",
     "eslint": "eslint --max-warnings 0 --ext .js .",
     "format": "prettier --write '**/*.{js,json}'",
-    "publish": "vsce publish"
+    "publish": "vsce publish",
+    "webview": "cd src/webview && yarn build --watch"
   },
   "devDependencies": {
     "@types/mocha": "^2.2.42",
-- 
GitLab