diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-07 01:02:01 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-07 07:07:08 -0700 |
| commit | d7accda1ae42fe2036060aaf3ef4447e8f352e35 (patch) | |
| tree | 0079ec7347a2a68555bc625a53bfe66da44684f9 /app/controllers/import | |
| parent | a1e6fc157f70f1fe5e8d7b8cc9a34d1ff108b7d8 (diff) | |
| download | gitlab-ce-d7accda1ae42fe2036060aaf3ef4447e8f352e35.tar.gz | |
Show incompatible projects in Bitbucket import status
See #1871
Diffstat (limited to 'app/controllers/import')
| -rw-r--r-- | app/controllers/import/bitbucket_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb index af0b841f0b7..4e6c0b66634 100644 --- a/app/controllers/import/bitbucket_controller.rb +++ b/app/controllers/import/bitbucket_controller.rb @@ -22,6 +22,7 @@ class Import::BitbucketController < Import::BaseController def status @repos = client.projects + @incompatible_repos = client.incompatible_projects @already_added_projects = current_user.created_projects.where(import_type: "bitbucket") already_added_projects_names = @already_added_projects.pluck(:import_source) |