From 3bacbab21cffe5919873900d80d29ead56737d35 Mon Sep 17 00:00:00 2001 From: campersau Date: Sat, 28 Mar 2020 13:30:20 +0100 Subject: [PATCH] Prepare version 1.5.6 --- CHANGELOG.md | 15 +++++++++++++-- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e503ea89..40aa56401 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,20 @@ # Change Log All notable changes to this project will be documented in this file. -This project adheres to [Semantic Versioning](http://semver.org/). +This project adheres to [Semantic Versioning](https://semver.org/). We are following the [Keep a Changelog](https://keepachangelog.com/) format. -## [Unreleased](https://github.com/FredrikNoren/ungit/compare/v1.5.5...master) +## [Unreleased](https://github.com/FredrikNoren/ungit/compare/v1.5.6...master) + +## [1.5.6](https://github.com/FredrikNoren/ungit/compare/v1.5.5...v1.5.6) + +### Fixed +- Continue rebase fails with git 2.26 [#1301](https://github.com/FredrikNoren/ungit/issues/1301) +- Dependency updates [#1304](https://github.com/FredrikNoren/ungit/pull/1304), [#1300](https://github.com/FredrikNoren/ungit/pull/1300), [#1297](https://github.com/FredrikNoren/ungit/pull/1297), [#1295](https://github.com/FredrikNoren/ungit/pull/1295) +- ignore nmclicktests and ci files in npm package [#1306](https://github.com/FredrikNoren/ungit/pull/1306) + +### Added +- GitHub Action CI [#1298](https://github.com/FredrikNoren/ungit/pull/1298) +- GitHub Action dependency bump [#1296](https://github.com/FredrikNoren/ungit/pull/1296) ## [1.5.5](https://github.com/FredrikNoren/ungit/compare/v1.5.4...v1.5.5) diff --git a/package-lock.json b/package-lock.json index f22c9dbe2..de5298ca0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ungit", - "version": "1.5.5", + "version": "1.5.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 74e4d8651..0a7387e69 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ungit", "author": "Fredrik Norén ", "description": "Git made easy", - "version": "1.5.5", + "version": "1.5.6", "ungitPluginApiVersion": "0.2.0", "scripts": { "start": "node ./bin/ungit",