From 003086ef259d860e901b542265dca1c83d8e7275 Mon Sep 17 00:00:00 2001 From: Mark Fletcher Date: Tue, 30 Jan 2018 10:00:32 +0000 Subject: Update CHANGELOG.md for 10.4.2 [ci skip] --- CHANGELOG.md | 16 ++++++++++++++++ changelogs/unreleased/32546-cannot-copy-paste-on-ios.yml | 5 ----- ...ess-not-visible-when-project-visibility-is-public.yml | 5 ----- ...edconversionerror-u-c124-from-utf-8-to-ascii-8bit.yml | 5 ----- .../42268-vendor-auto-devops-template-in-10-4.yml | 5 ----- ...lready-exists-and-is-not-an-empty-directory-error.yml | 6 ------ changelogs/unreleased/fix-cache-clear-windows.yml | 5 ----- changelogs/unreleased/fix-postgresql-table-grant.yml | 5 ----- 8 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 changelogs/unreleased/32546-cannot-copy-paste-on-ios.yml delete mode 100644 changelogs/unreleased/42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public.yml delete mode 100644 changelogs/unreleased/42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit.yml delete mode 100644 changelogs/unreleased/42268-vendor-auto-devops-template-in-10-4.yml delete mode 100644 changelogs/unreleased/42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error.yml delete mode 100644 changelogs/unreleased/fix-cache-clear-windows.yml delete mode 100644 changelogs/unreleased/fix-postgresql-table-grant.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index ca632ab172e..6f6a1234219 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,22 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.4.2 (2018-01-30) + +### Fixed (6 changes) + +- Fix copy/paste on iOS devices due to a bug in webkit. !15804 +- Fix missing "allow users to request access" option in public project permissions. !16485 +- Fix encoding issue when counting commit count. !16637 +- Fixes destination already exists, and some particular service errors on Import/Export error. !16714 +- Fix cache clear bug withg using : on Windows. !16740 +- Use has_table_privilege for TRIGGER on PostgreSQL. + +### Changed (1 change) + +- Vendor Auto DevOps template with DAST security checks enabled. !16691 + + ## 10.4.1 (2018-01-24) ### Fixed (4 changes) diff --git a/changelogs/unreleased/32546-cannot-copy-paste-on-ios.yml b/changelogs/unreleased/32546-cannot-copy-paste-on-ios.yml deleted file mode 100644 index f4c44983736..00000000000 --- a/changelogs/unreleased/32546-cannot-copy-paste-on-ios.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix copy/paste on iOS devices due to a bug in webkit -merge_request: 15804 -author: -type: fixed diff --git a/changelogs/unreleased/42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public.yml b/changelogs/unreleased/42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public.yml deleted file mode 100644 index 38684cd3c44..00000000000 --- a/changelogs/unreleased/42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix missing "allow users to request access" option in public project permissions -merge_request: 16485 -author: -type: fixed diff --git a/changelogs/unreleased/42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit.yml b/changelogs/unreleased/42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit.yml deleted file mode 100644 index c64bee9126e..00000000000 --- a/changelogs/unreleased/42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix encoding issue when counting commit count -merge_request: 16637 -author: -type: fixed diff --git a/changelogs/unreleased/42268-vendor-auto-devops-template-in-10-4.yml b/changelogs/unreleased/42268-vendor-auto-devops-template-in-10-4.yml deleted file mode 100644 index 48e2a5c0820..00000000000 --- a/changelogs/unreleased/42268-vendor-auto-devops-template-in-10-4.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Vendor Auto DevOps template with DAST security checks enabled -merge_request: 16691 -author: -type: changed diff --git a/changelogs/unreleased/42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error.yml b/changelogs/unreleased/42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error.yml deleted file mode 100644 index 660f4f5d42c..00000000000 --- a/changelogs/unreleased/42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Fixes destination already exists, and some particular service errors on Import/Export - error -merge_request: 16714 -author: -type: fixed diff --git a/changelogs/unreleased/fix-cache-clear-windows.yml b/changelogs/unreleased/fix-cache-clear-windows.yml deleted file mode 100644 index 2be6bac004b..00000000000 --- a/changelogs/unreleased/fix-cache-clear-windows.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'Fix cache clear bug withg using : on Windows' -merge_request: 16740 -author: -type: fixed diff --git a/changelogs/unreleased/fix-postgresql-table-grant.yml b/changelogs/unreleased/fix-postgresql-table-grant.yml deleted file mode 100644 index 1c6559f6f73..00000000000 --- a/changelogs/unreleased/fix-postgresql-table-grant.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use has_table_privilege for TRIGGER on PostgreSQL -merge_request: -author: -type: fixed -- cgit v1.2.1