diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-11-14 18:51:12 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-11-14 18:51:12 -0200 |
| commit | aad635a2837a2158aac138dade18041c9191487b (patch) | |
| tree | 11eb5ac1527ad907080b141538e5a8716809545e | |
| parent | 27c9e83573df07799f5d77ccf4cafe96a2d43ee5 (diff) | |
| download | gitlab-ce-aad635a2837a2158aac138dade18041c9191487b.tar.gz | |
Update CHANGELOG.md for 10.1.4
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/40092-fix-cluster-size.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/bvl-fork-network-memberships-for-deleted-source.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/dm-authorize-admin-oauth-application.yml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/issue_40058.yml | 5 |
5 files changed, 10 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4294ccaf9b6..f85b78cb277 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.1.4 (2017-11-14) + +### Fixed (4 changes) + +- Don't try to create fork network memberships for forks with a missing source. !15366 +- Formats bytes to human reabale number in registry table. +- Prevent error when authorizing an admin-created OAauth application without a set owner. +- Prevents position update for image diff notes. + + ## 10.1.3 (2017-11-10) - [SECURITY] Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization. diff --git a/changelogs/unreleased/40092-fix-cluster-size.yml b/changelogs/unreleased/40092-fix-cluster-size.yml deleted file mode 100644 index e7a16c6920c..00000000000 --- a/changelogs/unreleased/40092-fix-cluster-size.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Formats bytes to human reabale number in registry table -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/bvl-fork-network-memberships-for-deleted-source.yml b/changelogs/unreleased/bvl-fork-network-memberships-for-deleted-source.yml deleted file mode 100644 index ae1eb3aedd5..00000000000 --- a/changelogs/unreleased/bvl-fork-network-memberships-for-deleted-source.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Don't try to create fork network memberships for forks with a missing source -merge_request: 15366 -author: -type: fixed diff --git a/changelogs/unreleased/dm-authorize-admin-oauth-application.yml b/changelogs/unreleased/dm-authorize-admin-oauth-application.yml deleted file mode 100644 index 2787485bc28..00000000000 --- a/changelogs/unreleased/dm-authorize-admin-oauth-application.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Prevent error when authorizing an admin-created OAauth application without - a set owner -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/issue_40058.yml b/changelogs/unreleased/issue_40058.yml deleted file mode 100644 index 46e83d947ba..00000000000 --- a/changelogs/unreleased/issue_40058.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevents position update for image diff notes -merge_request: -author: -type: fixed |