diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-08 23:33:12 +0300 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-08 23:33:12 +0300 |
| commit | c92f1d893cc5f114ec1e00251b3d1dcec78fab28 (patch) | |
| tree | 8935a699fba25feb3ce0672acacf89c4e7836e2e /app/controllers/import/google_code_controller.rb | |
| parent | 4babf79aa1e8e2ec315f31fba0d3646825322d91 (diff) | |
| parent | d122279fb0a28f248e6cdba339cb1bcd96a91477 (diff) | |
Merge branch '10-8-stable-prepare-rc4' into '10-8-stable'
Prepare 10.8 RC4 release
See merge request gitlab-org/gitlab-ce!18784
Diffstat (limited to 'app/controllers/import/google_code_controller.rb')
| -rw-r--r-- | app/controllers/import/google_code_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/import/google_code_controller.rb b/app/controllers/import/google_code_controller.rb index baa19fb383d..9b26a00f7c7 100644 --- a/app/controllers/import/google_code_controller.rb +++ b/app/controllers/import/google_code_controller.rb @@ -73,15 +73,14 @@ class Import::GoogleCodeController < Import::BaseController @repos = client.repos @incompatible_repos = client.incompatible_repos - @already_added_projects = current_user.created_projects.where(import_type: "google_code") + @already_added_projects = find_already_added_projects('google_code') already_added_projects_names = @already_added_projects.pluck(:import_source) @repos.reject! { |repo| already_added_projects_names.include? repo.name } end def jobs - jobs = current_user.created_projects.where(import_type: "google_code").to_json(only: [:id, :import_status]) - render json: jobs + render json: find_jobs('google_code') end def create |