diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-04-30 20:08:45 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-04-30 20:08:45 +0300 |
commit | f2cf6d75ecc6082897543f976e8e4bee7ac24e90 (patch) | |
tree | 7b82e44078cc6b5a8db350c0b66893fe2488deca /app/controllers | |
parent | 6d22e9674456b921e0f951af10ba18505891ec10 (diff) | |
parent | 9c76a6fa96bd3c48dc1a64aecb082d4bd87dc2ba (diff) |
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/controllers')
-rw-r--r-- | app/controllers/import/google_code_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/import/google_code_controller.rb b/app/controllers/import/google_code_controller.rb index 5adf6ed7853..4aa6d28c9a8 100644 --- a/app/controllers/import/google_code_controller.rb +++ b/app/controllers/import/google_code_controller.rb @@ -72,6 +72,7 @@ class Import::GoogleCodeController < Import::BaseController end @repos = client.repos + @incompatible_repos = client.incompatible_repos @already_added_projects = current_user.created_projects.where(import_type: "google_code") already_added_projects_names = @already_added_projects.pluck(:import_source) |