diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-04 10:09:18 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-04 10:09:18 +0000 |
| commit | ae83801cd52269f6374e8885a96f531d594c6f49 (patch) | |
| tree | 64627b660f656cec86beaf8e31a0b37913220be6 /CHANGELOG | |
| parent | 5ffb07189cb24b0fff4e24fcfcd0c3be26e2a073 (diff) | |
| parent | f87eb2502023fb0c17d29aef398058c62736c9ca (diff) | |
| download | gitlab-ce-ae83801cd52269f6374e8885a96f531d594c6f49.tar.gz | |
Merge branch 'fix/import-error' into 'master'
Fix Import/Export error checking versions
Fixes small bug preventing the correct error message about Import/Export version being displayed.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20536
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5638
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 825643668de..98bb05d1dd1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -63,6 +63,9 @@ v 8.11.0 (unreleased) - Catch what warden might throw when profiling requests to re-throw it - Speed up and reduce memory usage of Commit#repo_changes, Repository#expire_avatar_cache and IrkerWorker +v 8.10.4 (unreleased) + - Fix Import/Export error checking versions + v 8.10.3 - Fix Import/Export issue importing milestones and labels not associated properly. !5426 - Fix timing problems running imports on production. !5523 |