diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-02 14:35:04 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-04 17:33:26 +0200 |
| commit | bddbcaefc2389e4c61763472cecbea150f10cd75 (patch) | |
| tree | 38ba599beed53505dfca09fce7a890bf3b125bb3 /app/controllers/import/google_code_controller.rb | |
| parent | 7603beffc916d06039cac63b223d8e6234b5d666 (diff) | |
| download | gitlab-ce-bddbcaefc2389e4c61763472cecbea150f10cd75.tar.gz | |
Backports every CE related change from ee-44542 to CE
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 |