diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-02-02 18:25:33 -0800 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-02-05 12:50:34 -0800 |
| commit | 592ed8738cccd68ced1c2fbf58d0ff16d66e8d14 (patch) | |
| tree | 362333a23fe20cbb78403a5ecb3d99a151670bf8 /app/controllers/import | |
| parent | 33349dd54928a0b074b4ae3ebfabf214799fc085 (diff) | |
| download | gitlab-ce-592ed8738cccd68ced1c2fbf58d0ff16d66e8d14.tar.gz | |
Gitlab.com integration: code folding
Diffstat (limited to 'app/controllers/import')
| -rw-r--r-- | app/controllers/import/github_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/import/gitlab_controller.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb index 3f0461ead51..08419a37476 100644 --- a/app/controllers/import/github_controller.rb +++ b/app/controllers/import/github_controller.rb @@ -19,7 +19,7 @@ class Import::GithubController < ApplicationController @already_added_projects = current_user.created_projects.where(import_type: "github") already_added_projects_names = @already_added_projects.pluck(:import_source) - @repos.reject!{|repo| already_added_projects_names.include? repo.full_name} + @repos.reject!{ |repo| already_added_projects_names.include? repo.full_name } end def jobs diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb index 3712af6f024..448fe6417be 100644 --- a/app/controllers/import/gitlab_controller.rb +++ b/app/controllers/import/gitlab_controller.rb @@ -16,11 +16,11 @@ class Import::GitlabController < ApplicationController @already_added_projects = current_user.created_projects.where(import_type: "gitlab") already_added_projects_names = @already_added_projects.pluck(:import_source) - @repos.to_a.reject!{|repo| already_added_projects_names.include? repo["path_with_namespace"]} + @repos.to_a.reject!{ |repo| already_added_projects_names.include? repo["path_with_namespace"] } end def jobs - jobs = current_user.created_projects.where(import_type: "gitlab").to_json(:only => [:id, :import_status]) + jobs = current_user.created_projects.where(import_type: "gitlab").to_json(only: [:id, :import_status]) render json: jobs end |