From 579b45dfa4572462dc28a4f44a62ae8421be35f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Thu, 28 Jul 2022 17:19:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fixed=20=E7=B2=BE=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=B8=8D=E5=8C=85=E5=90=AB=E7=A7=81=E6=9C=89=E4=BB=93?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/gitea/repository/languages/list_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/gitea/repository/languages/list_service.rb b/app/services/gitea/repository/languages/list_service.rb index 88d5dcbed..9c96d56ed 100644 --- a/app/services/gitea/repository/languages/list_service.rb +++ b/app/services/gitea/repository/languages/list_service.rb @@ -10,7 +10,7 @@ class Gitea::Repository::Languages::ListService < Gitea::ClientService def initialize(owner, repo, token) @owner = owner @repo = repo - @args = token + @token = token end def call From b22909a654a19d5c861acd4720b3fb46b7b06105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Thu, 28 Jul 2022 17:20:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fixed=20=E8=AF=AD=E8=A8=80=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3token=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/gitea/repository/languages/list_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/gitea/repository/languages/list_service.rb b/app/services/gitea/repository/languages/list_service.rb index 9c96d56ed..355c149df 100644 --- a/app/services/gitea/repository/languages/list_service.rb +++ b/app/services/gitea/repository/languages/list_service.rb @@ -10,7 +10,7 @@ class Gitea::Repository::Languages::ListService < Gitea::ClientService def initialize(owner, repo, token) @owner = owner @repo = repo - @token = token + @token = token end def call From f12cfabee3d6e6ba8037680d8eabc1b2821987af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Thu, 28 Jul 2022 17:30:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fixed=20=E7=B2=BE=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=B8=8D=E5=8C=85=E5=90=AB=E7=A7=81=E6=9C=89=E4=BB=93?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users/is_pinned_projects_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/users/is_pinned_projects_controller.rb b/app/controllers/users/is_pinned_projects_controller.rb index 1ddadd277..ff45120fb 100644 --- a/app/controllers/users/is_pinned_projects_controller.rb +++ b/app/controllers/users/is_pinned_projects_controller.rb @@ -1,7 +1,10 @@ class Users::IsPinnedProjectsController < Users::BaseController before_action :private_user_resources!, only: [:pin] - def index - @is_pinned_projects = observed_user.pinned_projects.order(position: :desc, created_at: :asc).includes(project: [:project_category, :project_language, :repository]).order(position: :desc) + def index + @is_pinned_projects = observed_user.pinned_projects.left_joins(:project) + .where("projects.is_public = TRUE") + .order(position: :desc, created_at: :asc) + .includes(project: [:project_category, :project_language, :repository]).order(position: :desc) @is_pinned_projects = kaminari_paginate(@is_pinned_projects) end From df57312056589974d2d622c0604eca6ad9e0eebf Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 29 Jul 2022 17:29:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/trace/client_service.rb | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/app/services/trace/client_service.rb b/app/services/trace/client_service.rb index 72ffa8ca2..67da5d7ae 100644 --- a/app/services/trace/client_service.rb +++ b/app/services/trace/client_service.rb @@ -8,8 +8,11 @@ class Trace::ClientService < ApplicationService def authed_post(token, url, params={}) puts "[trace][POST] request params: #{params}" puts "[trace][POST] request token: #{token}" - conn.headers['Authorization'] = token - conn.post(full_url(url), params[:data]) + conn.post do |req| + req.url full_url(url, 'post') + req.headers['Authorization'] = token + req.body = params[:data].as_json + end end def get(url, params={}) @@ -42,8 +45,11 @@ class Trace::ClientService < ApplicationService def authed_delete(token, url, params={}) puts "[trace][DELETE] request params: #{params}" puts "[trace][DELETE] request token: #{token}" - conn.headers['Authorization'] = token - conn.delete(full_url(url), params[:data]) + conn.delete do |req| + req.url full_url(url, 'delete') + req.headers['Authorization'] = token + req.body = params[:data].as_json + end end def patch(url, params={}) @@ -54,8 +60,11 @@ class Trace::ClientService < ApplicationService def authed_patch(token, url, params={}) puts "[trace][PATCH] request params: #{params}" puts "[trace][PATCH] request token: #{token}" - conn.headers['Authorization'] = token - conn.patch(full_url(url), params[:data]) + conn.patch do |req| + req.url full_url(url, 'patch') + req.headers['Authorization'] = token + req.body = params[:data].as_json + end end def put(url, params={}) @@ -66,8 +75,11 @@ class Trace::ClientService < ApplicationService def authed_put(token, url, params={}) puts "[trace][PUT] request params: #{params}" puts "[trace][PUT] request token: #{token}" - conn.headers['Authorization'] = token - conn.put(full_url(url), params[:data]) + conn.put do |req| + req.url full_url(url, 'put') + req.headers['Authorization'] = token + req.body = params[:data].as_json + end end def conn