diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-30 17:08:45 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-30 17:08:45 +0000 |
| commit | f2cf6d75ecc6082897543f976e8e4bee7ac24e90 (patch) | |
| tree | 7b82e44078cc6b5a8db350c0b66893fe2488deca /CHANGELOG | |
| parent | 6d22e9674456b921e0f951af10ba18505891ec10 (diff) | |
| parent | 9c76a6fa96bd3c48dc1a64aecb082d4bd87dc2ba (diff) | |
| download | gitlab-ce-f2cf6d75ecc6082897543f976e8e4bee7ac24e90.tar.gz | |
Merge branch 'show-invalid-projects-google-code-import' into 'master'
Show incompatible projects in Google Code import status
Using Google Code import with a JSON file that contained only one Subversion project led to confusion
over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion.
Closes #1531
## Screenshots
Before:
After with no projects available (notice the button is hidden):
After with 1 valid and 1 incompatible project:
See merge request !586
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3af83ddc256..a98c911f1aa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,7 +21,7 @@ v 7.11.0 (unreleased) - Include commit comments in MR from a forked project. - Fix adding new group members from admin area - Add default project and snippet visibility settings to the admin web UI. - - + - Show incompatible projects in Google Code import status (Stan Hu) - Fix bug where commit data would not appear in some subdirectories (Stan Hu) - Fix bug where Slack service channel was not saved in admin template settings. (Stan Hu) - Move snippets UI to fluid layout |