Merge branch 'dev_trustie' into dev_chain

This commit is contained in:
sylor_huang@126.com 2020-06-24 15:33:48 +08:00
commit cfae67c3c9
2 changed files with 2 additions and 2 deletions

View File

@ -5,7 +5,7 @@ module RepositoriesHelper
end end
def download_type(str) def download_type(str)
default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb png jpg gif tif psd svg) default_type = %w(xlsx xls ppt pptx pdf zip 7z rar exe pdb obj idb png jpg gif tif psd svg RData rdata)
default_type.include?(str&.downcase) default_type.include?(str&.downcase)
end end

View File

@ -4,7 +4,7 @@ class Mirror < ApplicationRecord
# 0: 同步镜像成功1: 正在同步镜像2: 同步失败默认值为0 # 0: 同步镜像成功1: 正在同步镜像2: 同步失败默认值为0
enum status: { succeeded: 0, waiting: 1, failed: 2 } enum status: { succeeded: 0, waiting: 1, failed: 2 }
belongs_to :repository belongs_to :repository, foreign_key: :repo_id
def set_status!(status=Mirror.statuses[:succeeded]) def set_status!(status=Mirror.statuses[:succeeded])