diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 78361f71..6d0867a0 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -92,24 +92,6 @@ class RepositoriesController < ApplicationController end end - def upload_file - file_ids = params[:attachment_ids] - if file_ids.present? - file_ids.each do |id| - attachment = Attachment.select(:id, :filename, :disk_directory, :disk_filename).find_by(id) - file_path = attachemnt&.diskfile.to_s - unless File.exists?(file_path) - file_content = File.open(file_path) - end - end - else - render_error("请上传文件") - end - - files.each do - - end - def repo_hook hook_type = request.headers["X-Gitea-Event"].to_s # 获取推送的方式 ownername = @project.owner.try(:login) diff --git a/app/interactors/gitea/create_file_interactor.rb b/app/interactors/gitea/create_file_interactor.rb index 6e3a6ca0..18e105f3 100644 --- a/app/interactors/gitea/create_file_interactor.rb +++ b/app/interactors/gitea/create_file_interactor.rb @@ -53,7 +53,7 @@ module Gitea def file_params file_params = {} - file_params = file_params.merge(branch: @params[:branch]) unless @params[:branch].blank? || @params[:new_branch].present? + file_params = file_params.merge(branch: @params[:branch]) unless (@params[:branch].blank? || @params[:new_branch].present?) file_params = file_params.merge(new_branch: @params[:new_branch]) unless @params[:new_branch].blank? file_params = file_params.merge(content: Base64.encode64(@params[:content])) file_params = file_params.merge(message: @params[:message]) unless @params[:message].blank? diff --git a/dump.rdb b/dump.rdb index 4b391e94..3922ec36 100644 Binary files a/dump.rdb and b/dump.rdb differ