Merge branch 'develop' into standalone_develop

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

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)

app/controllers/pull_requests_controller.rb

@@ -274,12 +274,12 @@ 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),
       # assignees: ["#{params[:assigned_login].to_s}"],
-      assignees: ["#{current_user.try(:login).to_s}"],
-      labels: params[:issue_tag_ids],
-      due_date: Time.now
+      assignees: ["#{assignee_login.to_s}"],
+      labels: params[:issue_tag_ids]
+      # due_date: Time.now
     })
     @issue_params = {
       author_id: current_user.id,

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)

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

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 =