diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index ae7e44a97..bad2ee69d 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -336,8 +336,14 @@ class IssuesController < ApplicationController } ChangeTokenJob.perform_later(change_params) end + if @issue.issue_classify.to_s == "pull_request" + @issue&.pull_request&.update_attribute(:status, 2) + end else @issue&.project_trends&.update_all(action_type: "create") + if @issue.issue_classify.to_s == "pull_request" + @issue&.pull_request&.update_attribute(:status, 0) + end end if @issue.issue_classify == "issue" close_message = "close_issue" diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index b0eea0e59..bf2334ddd 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -9,6 +9,11 @@ module RepositoriesHelper default_type.include?(str&.downcase) end + def image_type?(str) + default_type = %w(png jpg gif tif psd svg) + default_type.include?(str&.downcase) + end + def render_commit_author(author_json) return nil if author_json.blank? find_user_by_login author_json['login'] diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb index 7fd990c6f..584276378 100644 --- a/app/services/gitea/client_service.rb +++ b/app/services/gitea/client_service.rb @@ -21,6 +21,9 @@ class Gitea::ClientService < ApplicationService def post(url, params={}) puts "[gitea] request params: #{params}" request_url = [api_url, url].join('').freeze + Rails.logger.info("######_____api____request_url_______###############{request_url}") + Rails.logger.info("######_____api____request_params_______###############{params}") + auth_token = authen_params(params[:token]) response = conn(auth_token).post do |req| req.url "#{request_url}" diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder index 0698769e0..cdea42c8b 100644 --- a/app/views/repositories/_simple_entry.json.jbuilder +++ b/app/views/repositories/_simple_entry.json.jbuilder @@ -1,6 +1,7 @@ file_name = entry['name'] file_type = file_name.to_s.split(".").last direct_download = download_type(file_type) +image_type = image_type?(file_type) json.name file_name json.sha entry['sha'] json.path entry['path'] @@ -10,6 +11,7 @@ json.content entry['content'].present? && !direct_download ? render_decode64_con json.target entry['target'] json.download_url entry['download_url'] json.direct_download direct_download +json.image_type image_type if entry['latest_commit'] json.partial! 'last_commit', entry: entry