From a978e9b98d88837f90eb856b8bb10e3dfbccd712 Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Fri, 10 Nov 2017 21:12:10 -0200 Subject: Update CHANGELOG.md for 10.1.3 [ci skip] --- CHANGELOG.md | 16 ++++++++++++++++ changelogs/unreleased/32059-fix-oauth-phishing.yml | 6 ------ .../38385-gpg-tooltips-not-working-in-safari.yml | 5 ----- changelogs/unreleased/39704_fix_webhooks_log_time.yml | 5 ----- changelogs/unreleased/bvl-unlink-fixes.yml | 5 ----- ...oup-and-project-creation-when-external-by-default.yml | 6 ------ changelogs/unreleased/fix-import-export-arguments.yml | 5 ----- changelogs/unreleased/fix_diff_parsing.yml | 5 ----- .../fix_migration_that_adds_ff_merge_field.yml | 5 ----- changelogs/unreleased/issue_39176.yml | 5 ----- changelogs/unreleased/issue_39773_be.yml | 5 ----- .../jivl-fix-cancel-button-file-upload-new-issue.yml | 5 ----- .../pawel-disable_nfs_metrics_checks_39730.yml | 5 ----- .../unreleased/sh-fix-environment-slug-generation.yml | 5 ----- 14 files changed, 16 insertions(+), 67 deletions(-) delete mode 100644 changelogs/unreleased/32059-fix-oauth-phishing.yml delete mode 100644 changelogs/unreleased/38385-gpg-tooltips-not-working-in-safari.yml delete mode 100644 changelogs/unreleased/39704_fix_webhooks_log_time.yml delete mode 100644 changelogs/unreleased/bvl-unlink-fixes.yml delete mode 100644 changelogs/unreleased/dm-block-group-and-project-creation-when-external-by-default.yml delete mode 100644 changelogs/unreleased/fix-import-export-arguments.yml delete mode 100644 changelogs/unreleased/fix_diff_parsing.yml delete mode 100644 changelogs/unreleased/fix_migration_that_adds_ff_merge_field.yml delete mode 100644 changelogs/unreleased/issue_39176.yml delete mode 100644 changelogs/unreleased/issue_39773_be.yml delete mode 100644 changelogs/unreleased/jivl-fix-cancel-button-file-upload-new-issue.yml delete mode 100644 changelogs/unreleased/pawel-disable_nfs_metrics_checks_39730.yml delete mode 100644 changelogs/unreleased/sh-fix-environment-slug-generation.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 2482f0124bd..4294ccaf9b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,22 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.1.3 (2017-11-10) + +- [SECURITY] Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization. +- [FIXED] Fix cancel button not working while uploading on the new issue page. !15137 +- [FIXED] Fix webhooks recent deliveries. !15146 (Alexander Randa (@randaalex)) +- [FIXED] Fix issues with forked projects of which the source was deleted. !15150 +- [FIXED] Fix GPG signature popup info in Safari and Firefox. !15228 +- [FIXED] Make sure group and project creation is blocked for new users that are external by default. +- [FIXED] Fix arguments Import/Export error importing project merge requests. +- [FIXED] Fix diff parser so it tolerates to diff special markers in the content. +- [FIXED] Fix a migration that adds merge_requests_ff_only_enabled column to MR table. +- [FIXED] Render 404 when polling commit notes without having permissions. +- [FIXED] Show error message when fast-forward merge is not possible. +- [FIXED] Avoid regenerating the ref path for the environment. +- [PERFORMANCE] Remove Filesystem check metrics that use too much CPU to handle requests. + ## 10.1.2 (2017-11-08) - [SECURITY] Add X-Content-Type-Options header in API responses to make it more difficult to find other vulnerabilities. diff --git a/changelogs/unreleased/32059-fix-oauth-phishing.yml b/changelogs/unreleased/32059-fix-oauth-phishing.yml deleted file mode 100644 index 1aaa7285309..00000000000 --- a/changelogs/unreleased/32059-fix-oauth-phishing.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Prevent OAuth phishing attack by presenting detailed wording about app to user - during authorization -merge_request: -author: -type: security diff --git a/changelogs/unreleased/38385-gpg-tooltips-not-working-in-safari.yml b/changelogs/unreleased/38385-gpg-tooltips-not-working-in-safari.yml deleted file mode 100644 index c7e840f0723..00000000000 --- a/changelogs/unreleased/38385-gpg-tooltips-not-working-in-safari.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix GPG signature popup info in Safari and Firefox -merge_request: 15228 -author: -type: fixed diff --git a/changelogs/unreleased/39704_fix_webhooks_log_time.yml b/changelogs/unreleased/39704_fix_webhooks_log_time.yml deleted file mode 100644 index 1234663e66b..00000000000 --- a/changelogs/unreleased/39704_fix_webhooks_log_time.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix webhooks recent deliveries -merge_request: 15146 -author: Alexander Randa (@randaalex) -type: fixed diff --git a/changelogs/unreleased/bvl-unlink-fixes.yml b/changelogs/unreleased/bvl-unlink-fixes.yml deleted file mode 100644 index 685d78f479d..00000000000 --- a/changelogs/unreleased/bvl-unlink-fixes.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix issues with forked projects of which the source was deleted -merge_request: 15150 -author: -type: fixed diff --git a/changelogs/unreleased/dm-block-group-and-project-creation-when-external-by-default.yml b/changelogs/unreleased/dm-block-group-and-project-creation-when-external-by-default.yml deleted file mode 100644 index 42bcf9b1edd..00000000000 --- a/changelogs/unreleased/dm-block-group-and-project-creation-when-external-by-default.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Make sure group and project creation is blocked for new users that are external - by default -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-import-export-arguments.yml b/changelogs/unreleased/fix-import-export-arguments.yml deleted file mode 100644 index eee87e313ea..00000000000 --- a/changelogs/unreleased/fix-import-export-arguments.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix arguments Import/Export error importing project merge requests -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix_diff_parsing.yml b/changelogs/unreleased/fix_diff_parsing.yml deleted file mode 100644 index 7a26b4f9ff5..00000000000 --- a/changelogs/unreleased/fix_diff_parsing.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix diff parser so it tolerates to diff special markers in the content -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix_migration_that_adds_ff_merge_field.yml b/changelogs/unreleased/fix_migration_that_adds_ff_merge_field.yml deleted file mode 100644 index a1685497331..00000000000 --- a/changelogs/unreleased/fix_migration_that_adds_ff_merge_field.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix a migration that adds merge_requests_ff_only_enabled column to MR table -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/issue_39176.yml b/changelogs/unreleased/issue_39176.yml deleted file mode 100644 index 6255b51c094..00000000000 --- a/changelogs/unreleased/issue_39176.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Render 404 when polling commit notes without having permissions -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/issue_39773_be.yml b/changelogs/unreleased/issue_39773_be.yml deleted file mode 100644 index db30267d71f..00000000000 --- a/changelogs/unreleased/issue_39773_be.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Show error message when fast-forward merge is not possible -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/jivl-fix-cancel-button-file-upload-new-issue.yml b/changelogs/unreleased/jivl-fix-cancel-button-file-upload-new-issue.yml deleted file mode 100644 index 0205d9626b1..00000000000 --- a/changelogs/unreleased/jivl-fix-cancel-button-file-upload-new-issue.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix cancel button not working while uploading on the new issue page -merge_request: 15137 -author: -type: fixed diff --git a/changelogs/unreleased/pawel-disable_nfs_metrics_checks_39730.yml b/changelogs/unreleased/pawel-disable_nfs_metrics_checks_39730.yml deleted file mode 100644 index 556d7d069d3..00000000000 --- a/changelogs/unreleased/pawel-disable_nfs_metrics_checks_39730.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove Filesystem check metrics that use too much CPU to handle requests -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/sh-fix-environment-slug-generation.yml b/changelogs/unreleased/sh-fix-environment-slug-generation.yml deleted file mode 100644 index 8a9c670c52c..00000000000 --- a/changelogs/unreleased/sh-fix-environment-slug-generation.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Avoid regenerating the ref path for the environment -merge_request: -author: -type: fixed -- cgit v1.2.1