From f33b9559cd4a1100437f315cabf37a258881defa Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 13 Jan 2022 11:24:27 +0800 Subject: [PATCH 1/5] fix: download delay --- app/helpers/repositories_helper.rb | 2 +- app/views/repositories/_simple_entry.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index b357d40b3..c69241858 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -11,7 +11,7 @@ module RepositoriesHelper def download_type(str) default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb RData rdata doc docx mpp vsdx dot otf eot ttf woff woff2 mp4 mov wmv flv mpeg avi avchd webm mkv) - default_type.include?(str&.downcase) + default_type.include?(str&.downcase) || str.blank? end def image_type?(str) diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder index 80a54d477..9d0998c82 100644 --- a/app/views/repositories/_simple_entry.json.jbuilder +++ b/app/views/repositories/_simple_entry.json.jbuilder @@ -9,7 +9,7 @@ if @project.forge? json.type entry['type'] json.size entry['size'] - json.content decode64_content(entry, @owner, @repository, @ref, @path) + json.content direct_download ? nil : decode64_content(entry, @owner, @repository, @ref, @path) json.target entry['target'] download_url = From b6b8befde797cb4365dbbe5c52fc8f7c726353f2 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 14 Jan 2022 10:55:01 +0800 Subject: [PATCH 2/5] fix: pr update must edit assignee login --- app/controllers/pull_requests_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index bd9ae7701..0e3b5e608 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -274,10 +274,11 @@ class PullRequestsController < ApplicationController base: params[:base], #目标分支 milestone: 0, #里程碑,未与本地的里程碑关联 } + assignee_login = User.find_by_id(params[:assigned_to_id])&.login @requests_params = @local_params.merge({ - assignee: current_user.try(:login), + assignee: assignee_login, # assignees: ["#{params[:assigned_login].to_s}"], - assignees: ["#{current_user.try(:login).to_s}"], + assignees: ["#{assignee_login.to_s}"], labels: params[:issue_tag_ids], due_date: Time.now }) From 5d45b24299edc087fa598f6ad52b26a085b10a28 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 14 Jan 2022 10:55:53 +0800 Subject: [PATCH 3/5] fix: devops return result changed --- app/controllers/concerns/ci/cloud_account_manageable.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/ci/cloud_account_manageable.rb b/app/controllers/concerns/ci/cloud_account_manageable.rb index 13edb09c6..9f0998edc 100644 --- a/app/controllers/concerns/ci/cloud_account_manageable.rb +++ b/app/controllers/concerns/ci/cloud_account_manageable.rb @@ -179,7 +179,7 @@ module Ci::CloudAccountManageable def drone_oauth_user!(url, state) logger.info "[drone] drone_oauth_user url: #{url}" - conn = Faraday.new(url: url) do |req| + conn = Faraday.new(url: "#{Gitea.gitea_config[:domain]}#{url}") do |req| req.request :url_encoded req.adapter Faraday.default_adapter req.headers["cookie"] = "_session_=#{SecureRandom.hex(28)}; _oauth_state_=#{state}" @@ -188,7 +188,8 @@ module Ci::CloudAccountManageable response = conn.get logger.info "[drone] response headers: #{response.headers}" - response.headers['location'].include?('error') ? false : true + true + # response.headers['location'].include?('error') ? false : true end private From 25d0e784bbcc29cbc17051c8bafd1432ad909333 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 14 Jan 2022 16:00:59 +0800 Subject: [PATCH 4/5] fix: pr assignee info use array --- app/controllers/pull_requests_controller.rb | 5 ++--- app/services/pull_requests/create_service.rb | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 0e3b5e608..2417e4fd5 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -276,11 +276,10 @@ class PullRequestsController < ApplicationController } assignee_login = User.find_by_id(params[:assigned_to_id])&.login @requests_params = @local_params.merge({ - assignee: assignee_login, # assignees: ["#{params[:assigned_login].to_s}"], assignees: ["#{assignee_login.to_s}"], - labels: params[:issue_tag_ids], - due_date: Time.now + labels: params[:issue_tag_ids] + # due_date: Time.now }) @issue_params = { author_id: current_user.id, diff --git a/app/services/pull_requests/create_service.rb b/app/services/pull_requests/create_service.rb index 4b814fd33..d15b3f9fc 100644 --- a/app/services/pull_requests/create_service.rb +++ b/app/services/pull_requests/create_service.rb @@ -125,7 +125,10 @@ class PullRequests::CreateService < ApplicationService end def gitea_pull_request_params - merge_original_pull_params.except(:milestone) + assignee_login = User.find_by_id(params[:assigned_to_id])&.login + merge_original_pull_params.except(:milestone).merge( + # assignees: ["#{params[:assigned_login].to_s}"], + assignees: ["#{assignee_login.to_s}"]) end def merge_original_pull_params From 70d22f7c4f7d503ae15eed63369fb7865a3ac6ea Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 14 Jan 2022 16:09:38 +0800 Subject: [PATCH 5/5] fix: create team overflow tip --- app/controllers/organizations/teams_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/organizations/teams_controller.rb b/app/controllers/organizations/teams_controller.rb index 285f9960b..09f5bc3f0 100644 --- a/app/controllers/organizations/teams_controller.rb +++ b/app/controllers/organizations/teams_controller.rb @@ -44,7 +44,7 @@ class Organizations::TeamsController < Organizations::BaseController def create ActiveRecord::Base.transaction do if @organization.teams.count >= 50 - return render_forbidden("组织的团队数量已超过限制！") + return tip_exception("组织的团队数量已超过限制！") else Organizations::CreateTeamForm.new(team_params).validate! @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)