xxq250 111b91584d Merge branch 'standalone_develop' into dev_local_v1 ...

# Conflicts:
#	app/controllers/projects_controller.rb
#	app/jobs/migrate_remote_repository_job.rb
#	public/assets/.sprockets-manifest-dd73942813e820b803d35c9915c0bb25.json
#	public/assets/admin-5a48f49881bac9e22c837c20db22ea3b51b424751ddb12208a3b422b752e60fd.js
#	public/assets/admin-5a48f49881bac9e22c837c20db22ea3b51b424751ddb12208a3b422b752e60fd.js.gz
#	public/assets/admin-a7edfa013f5e822c43ac1a1f813c1929ff7aa9e12cd1313f9e1b7292fa406470.css.gz

2023-10-11 15:57:09 +08:00

..

assets

Merge branch 'standalone_develop' into dev_local_v1

2023-10-11 15:57:09 +08:00

channels

FIX actioncable job

2020-07-07 16:08:10 +08:00

constraint

qianyi datas

2020-07-09 16:46:57 +08:00

controllers

Merge branch 'standalone_develop' into dev_local_v1

2023-10-11 15:57:09 +08:00

decorators

FIX code review

2021-11-11 18:03:30 +08:00

docs/slate/source

Merge branch 'develop' into standalone_develop

2022-09-29 13:59:04 +08:00

forms

Merge branch 'standalone_develop' into dev_local_v1

2023-10-11 15:57:09 +08:00

helpers

fixed 文件增加是否文本判断，可显示多种文本文件

2023-10-10 14:17:08 +08:00

imports

add: download and import user template xlsx

2022-05-16 16:59:25 +08:00

interactors

fixed 文件无权限提示修改

2023-08-30 16:09:28 +08:00

jobs

SyncRepoUpdateTimeJob stop

2023-07-27 15:23:06 +08:00

libs

getway lib

2023-09-27 14:12:03 +08:00

mailers

pr check and send email

2023-08-08 16:27:54 +08:00

models

add data_bank to user action

2023-10-10 13:49:52 +08:00

queries

调整用户获取站点排序

2023-08-29 09:35:03 +08:00

services

Merge branch 'standalone_develop' into dev_local_v1

2023-10-11 15:57:09 +08:00

tasks

Fix admin project list

2020-07-22 17:21:59 +08:00

views

fixed 文件增加是否文本判断，可显示多种文本文件

2023-10-10 14:17:08 +08:00