diff --git a/CHANGELOG.md b/CHANGELOG.md index 04c657c..8eaea64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,7 @@ # Changelog All changes to the project will be documented in this file. -## 4.21.1 - 01 Jan 2018 - +### 4.21.1 - 27 Jan 2018 - Release page - OpenID Connect support - New database viewer @@ -10,7 +9,6 @@ - Clarify close/reopen button ## 4.20.0 - 23 Dec 2017 - - Squash and rebase merge strategy for pull requests - Quick pull request creation - Download patch from the diff view @@ -21,17 +19,14 @@ - Display conflicting files if pull request can't be merged ## 4.19.3 - 7 Dec 2017 - - Fix file uploading bug - Fix reply comment form behavior in the diff view ## 4.19.2 - 3 Dec 2017 - - Fix routing bug in `CompositeScalatraFilter` - Resolve id attribute collision in the web hook editing form ## 4.19.1 - 2 Dec 2017 - - Update gitbucket-notifications-plugin because it had a version compatibility issue ## 4.19.0 - 2 Dec 2017 diff --git a/README.md b/README.md index 6483d29..3ab424c 100644 --- a/README.md +++ b/README.md @@ -68,11 +68,10 @@ - If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue. - The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. -What's New in 4.20.x +What's New in 4.21.x ------------- -### 4.21.1 - 01 Jan 2018 - +### 4.21.1 - 27 Jan 2018 - Release page - OpenID Connect support - New database viewer