diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 12:07:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 12:07:49 +0300 |
| commit | 0ba3a054d2190094ffda1ebe3aa53ffc5b92247d (patch) | |
| tree | 8462503456eb030bb1042c6af73edc8f8af49fc6 /changelogs/unreleased | |
| parent | b24ae1cbc66e5b0f622393bcf2c59711750161ea (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs/unreleased')
| -rw-r--r-- | changelogs/unreleased/31859-fix-discarding-renamed-entry-with-changes.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/cluster-applications-0-4-0.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/31859-fix-discarding-renamed-entry-with-changes.yml b/changelogs/unreleased/31859-fix-discarding-renamed-entry-with-changes.yml new file mode 100644 index 00000000000..f5baaab2382 --- /dev/null +++ b/changelogs/unreleased/31859-fix-discarding-renamed-entry-with-changes.yml @@ -0,0 +1,5 @@ +--- +title: Update IDE discard of renamed entry to also discard file changes +merge_request: 22573 +author: +type: fixed diff --git a/changelogs/unreleased/cluster-applications-0-4-0.yml b/changelogs/unreleased/cluster-applications-0-4-0.yml new file mode 100644 index 00000000000..0a06107bf62 --- /dev/null +++ b/changelogs/unreleased/cluster-applications-0-4-0.yml @@ -0,0 +1,5 @@ +--- +title: Bump cluster-applications image to v0.4.0, adding support to install cert-manager +merge_request: 22657 +author: +type: changed |