diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-05 20:17:57 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-05 20:17:57 +0000 |
| commit | 1dfbb27f6e8d01023564eededff2a0ba1a04badc (patch) | |
| tree | b5931bf3706fd0c514722462266e3f7122f5b136 | |
| parent | 926def1f7a544fba019b058fe6aa709a2f60989e (diff) | |
| download | gitlab-ce-1dfbb27f6e8d01023564eededff2a0ba1a04badc.tar.gz | |
Update CHANGELOG.md for 12.1.4
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 13 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-i18n-updated-projects.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/leipert-improve-ansi2html.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/osw-avoid-errors-due-to-concurrent-calls.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/patch-72.yml | 5 |
5 files changed, 13 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 15b55f01c32..0752708d5e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.1.4 + +### Fixed (3 changes, 1 of them is from the community) + +- Properly translate term in projects list. !30958 +- Add exclusive lease to mergeability check process. !31082 +- Fix Docker in Docker (DIND) listen port behavior change by adding DOCKER_TLS_CERTDIR in CI job templates. !31201 (Cameron Boulton) + +### Performance (1 change) + +- Improve job log rendering performance. !31262 + + ## 12.1.3 ### Fixed (11 changes) diff --git a/changelogs/unreleased/fix-i18n-updated-projects.yml b/changelogs/unreleased/fix-i18n-updated-projects.yml deleted file mode 100644 index 408ee438480..00000000000 --- a/changelogs/unreleased/fix-i18n-updated-projects.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Properly translate term in projects list -merge_request: 30958 -author: -type: fixed diff --git a/changelogs/unreleased/leipert-improve-ansi2html.yml b/changelogs/unreleased/leipert-improve-ansi2html.yml deleted file mode 100644 index dd3582b3434..00000000000 --- a/changelogs/unreleased/leipert-improve-ansi2html.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve job log rendering performance -merge_request: 31262 -author: -type: performance diff --git a/changelogs/unreleased/osw-avoid-errors-due-to-concurrent-calls.yml b/changelogs/unreleased/osw-avoid-errors-due-to-concurrent-calls.yml deleted file mode 100644 index 17ff1b012cf..00000000000 --- a/changelogs/unreleased/osw-avoid-errors-due-to-concurrent-calls.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add exclusive lease to mergeability check process -merge_request: 31082 -author: -type: fixed diff --git a/changelogs/unreleased/patch-72.yml b/changelogs/unreleased/patch-72.yml deleted file mode 100644 index ff2bac2fc29..00000000000 --- a/changelogs/unreleased/patch-72.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix Docker in Docker (DIND) listen port behavior change by adding DOCKER_TLS_CERTDIR in CI job templates. -merge_request: 31201 -author: Cameron Boulton -type: fixed |