diff --git a/app/controllers/traces/projects_controller.rb b/app/controllers/traces/projects_controller.rb index fee8fda9e..b3c2ef66a 100644 --- a/app/controllers/traces/projects_controller.rb +++ b/app/controllers/traces/projects_controller.rb @@ -32,6 +32,7 @@ class Traces::ProjectsController < Traces::BaseController limit = params[:limit] || params[:per_page] limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i page = params[:page].to_i.zero? ? 1 : params[:page].to_i + return render :json => {data: []} if current_user.trace_user.nil? code, data, error = Trace::CheckResultService.call(current_user.trace_token, @project, nil, page, limit) if code == 200 render :json => {data: data} diff --git a/app/services/trace/check_service.rb b/app/services/trace/check_service.rb index cf1fcf133..f12319502 100644 --- a/app/services/trace/check_service.rb +++ b/app/services/trace/check_service.rb @@ -26,7 +26,7 @@ class Trace::CheckService < Trace::ClientService git_url: repo['clone_url'], if_branch: if_branch, branch_tag: branch_tag - } + }.compact end def url