summaryrefslogtreecommitdiff
path: root/app/views/projects/labels/edit.html.haml
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-30 17:08:45 +0000
committerDouwe Maan <douwe@gitlab.com>2015-04-30 17:08:45 +0000
commitf2cf6d75ecc6082897543f976e8e4bee7ac24e90 (patch)
tree7b82e44078cc6b5a8db350c0b66893fe2488deca /app/views/projects/labels/edit.html.haml
parent6d22e9674456b921e0f951af10ba18505891ec10 (diff)
parent9c76a6fa96bd3c48dc1a64aecb082d4bd87dc2ba (diff)
downloadgitlab-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: ![Screen_Shot_2015-04-29_at_12.46.41_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/16ea5a99cbace48cd2f2c238b5f73f4e/Screen_Shot_2015-04-29_at_12.46.41_AM.png) After with no projects available (notice the button is hidden): ![Screen_Shot_2015-04-30_at_1.34.38_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/43c612cdcbab181713e5764e2f38a04e/Screen_Shot_2015-04-30_at_1.34.38_AM.png) After with 1 valid and 1 incompatible project: ![Screen_Shot_2015-04-30_at_1.37.26_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5bcbd304206a996932e5208ef54a071/Screen_Shot_2015-04-30_at_1.37.26_AM.png) See merge request !586
Diffstat (limited to 'app/views/projects/labels/edit.html.haml')
0 files changed, 0 insertions, 0 deletions