diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 21:49:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 21:49:42 +0000 |
| commit | f492aba2af7bde3b911a559d27e1ce8c40999893 (patch) | |
| tree | ed8988282fba8aecb6d709e26d0358fc6346070e | |
| parent | c741c26fa0743e76c9331aa214ebe16559f1d2a6 (diff) | |
| download | gitlab-ce-f492aba2af7bde3b911a559d27e1ce8c40999893.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-7-stable-ee
| -rw-r--r-- | CHANGELOG-EE.md | 7 | ||||
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/198938-fix-invalid-issue-tracker-data.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-missing-apply-sugegstion-project-setting.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/id-fix-suggestions.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-trigger-check-rds.yml | 5 |
7 files changed, 18 insertions, 21 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index 62cb7f17fbd..10e6b84a6e3 100644 --- a/CHANGELOG-EE.md +++ b/CHANGELOG-EE.md @@ -1,5 +1,12 @@ Please view this file on the master branch, on stable branches it's out of date. +## 12.7.5 + +### Fixed (1 change) + +- Fix DB connection pool size for Geo database. !24021 + + ## 12.7.4 - No changes. diff --git a/CHANGELOG.md b/CHANGELOG.md index ad345639076..f69f35c24ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.7.5 + +### Fixed (4 changes, 1 of them is from the community) + +- Add accidentally deleted project config for custom apply suggestions. !23687 (Fabio Huser) +- Fix database permission check for triggers on Amazon RDS. !24035 +- Fix applying the suggestions with an empty custom message. !24144 +- Remove invalid data from issue_tracker_data table. + + ## 12.7.4 ### Security (1 change) @@ -1 +1 @@ -12.7.4-ee +12.7.5-ee diff --git a/changelogs/unreleased/198938-fix-invalid-issue-tracker-data.yml b/changelogs/unreleased/198938-fix-invalid-issue-tracker-data.yml deleted file mode 100644 index 36bf6e3aa26..00000000000 --- a/changelogs/unreleased/198938-fix-invalid-issue-tracker-data.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove invalid data from issue_tracker_data table -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-missing-apply-sugegstion-project-setting.yml b/changelogs/unreleased/fix-missing-apply-sugegstion-project-setting.yml deleted file mode 100644 index d084148fbd8..00000000000 --- a/changelogs/unreleased/fix-missing-apply-sugegstion-project-setting.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add accidentally deleted project config for custom apply suggestions -merge_request: 23687 -author: Fabio Huser -type: fixed diff --git a/changelogs/unreleased/id-fix-suggestions.yml b/changelogs/unreleased/id-fix-suggestions.yml deleted file mode 100644 index 3987a590e14..00000000000 --- a/changelogs/unreleased/id-fix-suggestions.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix applying the suggestions with an empty custom message -merge_request: 24144 -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-trigger-check-rds.yml b/changelogs/unreleased/sh-fix-trigger-check-rds.yml deleted file mode 100644 index 99ae6039aaa..00000000000 --- a/changelogs/unreleased/sh-fix-trigger-check-rds.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix database permission check for triggers on Amazon RDS -merge_request: 24035 -author: -type: fixed |