Commit Graph

338 Commits

Author SHA1 Message Date
xiaoxiaoqiong 43334935d9 Merge remote-tracking branch 'origin/dev_jk_server' into dev_jk_server 2022-03-11 14:53:32 +08:00
xiaoxiaoqiong 958b1618b1 gitea 请求延长到20分钟 2022-03-11 14:53:28 +08:00
yystopf e489c57fe8 fix: merge from develop 2022-03-10 11:07:14 +08:00
yystopf 8d0a6d267a fix: download escape 2022-03-10 10:47:06 +08:00
yystopf ef12f85687 fix: create pull request valid merge_user_login 2022-03-07 11:17:10 +08:00
yystopf 9e2db8a7f6 fix: merge from develop 2022-03-01 17:37:10 +08:00
yystopf a2612d8009 fix 2022-02-24 18:09:11 +08:00
yystopf 2f2655525f fix: user rank user_id must exist 2022-02-24 18:07:18 +08:00
xiaoxiaoqiong c1ea0232bb fixed注册gitea 2022-02-22 13:48:37 +08:00
yystopf 7c664addbd fix 2022-02-22 11:03:28 +08:00
xiaoxiaoqiong 2e511655f6 Merge branch 'develop' into dev_jk_server
# Conflicts:
#	app/models/concerns/matchable.rb
#	config/routes.rb
2022-02-17 18:31:25 +08:00
yystopf b3bede308c add: some new message rules 2022-02-15 17:13:06 +08:00
yystopf 26f87fba16 fix: edit transfer need change fork info 2022-01-25 14:26:11 +08:00
yystopf c5063e513d fix: issue destroy return duplicate 2022-01-21 11:31:36 +08:00
yystopf e7af0e2e47 fix: license is secret delay 2022-01-18 18:32:33 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 25d0e784bb fix: pr assignee info use array 2022-01-14 16:00:59 +08:00
yystopf 7a1e6cfbad fix: issue edit and new branches only load name api 2022-01-07 15:19:10 +08:00
yystopf 8c99b754fb fix: create pr branch name escape 2021-12-28 18:37:44 +08:00
yystopf f3cf2c87c9 fix: create pr branch name escape 2021-12-28 18:29:58 +08:00
yystopf dbf5e711a5 fix 2021-12-27 17:44:08 +08:00
yystopf dcf44a78f0 fix: unvalid branch name return error 2021-12-27 16:34:54 +08:00
yystopf aa60de1dac fix: valid pr title length 2021-12-20 15:38:08 +08:00
yystopf 29f98513e2 fix: org update error 2021-12-20 15:38:08 +08:00
yystopf e3df503dd2 fix 2021-12-14 10:13:28 +08:00
yystopf 6a2ad67386 fix 2021-12-14 09:53:54 +08:00
yystopf 3d12db3a07 fix: atme service use perform later 2021-12-14 09:39:26 +08:00
yystopf c4586fbb36 fix: remove detail language and contributors 2021-12-08 14:11:37 +08:00
yystopf 74e5fa0e31 fix: fork project id validate 2021-11-29 17:01:39 +08:00
yystopf 7499d8af89 fix: project private params to boolean 2021-11-29 14:43:29 +08:00
yystopf d16f290aa6 fix: create pr validate fork_project_id 2021-11-29 14:17:27 +08:00
yystopf 9385d346f1 fix 2021-11-29 14:03:17 +08:00
yystopf c0a4f8f4ec fix: create pull request need compare 2021-11-29 10:53:59 +08:00
yystopf 7586a0fb21 fix: change issue tag change size 2021-11-29 10:27:41 +08:00
xxq250 72553dec57 Merge pull request '一些功能修改以及bug修复' (#263) from yystopf/forgeplus:hh_hotfix into develop 2021-11-26 09:39:58 +08:00
yystopf be0f68cede fix 2021-11-25 11:19:50 +08:00
yystopf 1b92b53099 fix 2021-11-25 11:00:19 +08:00
yystopf 5634413cac add: create pullrequest validate 2021-11-25 10:52:42 +08:00
yystopf 1f989d0a37 fix: delete organization tip 2021-11-19 14:44:25 +08:00
yystopf 55ab694505 fix: change email default rule 2021-11-19 10:21:09 +08:00
jasder e216d7da70 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-11 18:09:26 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
jasder 96c67d359e FIX 发送pr时,分支对比功能添加gitea 接口支持(pr_merge api)(bug) 2021-11-10 11:20:14 +08:00
yystopf 2e35fb92a9 fix: change message template email title 2021-11-09 17:04:45 +08:00
jasder 6fe3507a16 Merge remote-tracking branch 'gitlink/develop' into develop 2021-11-08 14:22:57 +08:00
jasder 6b0f9a689a Merge pull request '@我功能' (#239) from yystopf/forgeplus:hh_notification_v2_2 into develop 2021-11-08 14:21:00 +08:00
yystopf 1a449d1dc6 add: atme service 2021-11-08 11:35:14 +08:00
jasder 25e1bf1565 FIX 后台管理修改用户信息支持同步到gitea 2021-11-05 18:54:14 +08:00
jasder c19c83d505 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-05 11:36:51 +08:00
jasder 9f31dc02f4 FIX 后台管理修改用户信息时同步git用户 2021-11-04 17:58:45 +08:00