anph
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,341 Commits 48 Branches 16 Tags 710 MiB
Commit Graph

135 Commits

Author SHA1 Message Date
xxq250 c07ccbe6be Merge branch 'dev_nanda' into dev_blockchain 2023-03-01 17:52:13 +08:00
xxq250 d453030db1 MultiLogger删除 2023-03-01 17:49:51 +08:00
xxq250 1b870f19ee Merge branch 'dev_nanda' into dev_blockchain 
# Conflicts:
#	Gemfile
#	app/services/application_service.rb
 2023-03-01 17:43:59 +08:00
xxq250 1cd43de75b 增加Bot授权相关 2023-02-15 18:37:36 +08:00
xxq250 52457e92c7 Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus into dev_nanda 
# Conflicts:
#	app/controllers/issues_controller.rb
 2023-02-04 18:09:46 +08:00
zhangxunhui 06a6794245 调整了blockchain api 2023-02-04 11:06:04 +08:00
zhangxunhui 11023cbc70 change reponame to identifier 2023-02-03 14:07:39 +08:00
zhangxunhui 7b1b03ab41 change push_activity_2_blockchain by querying projects with identifier 2023-02-03 13:19:27 +08:00
xxq250 2271afe98c fixed 错误代码 2023-01-30 22:58:29 +08:00
zhangxunhui 6b6a4bc48e change render_okr to render_ok 2023-01-30 21:45:48 +08:00
zhangxunhui 84f094ac55 change end comment 2023-01-30 21:37:31 +08:00
zhangxunhui d9a0b34cb8 comment user.current 2023-01-30 21:35:22 +08:00
zhangxunhui 79eb1b93e9 update blockchain related services 2023-01-30 21:18:11 +08:00
zhangxunhui 31a3e6ccea update push_activity_2_blockchain function 2023-01-30 20:20:44 +08:00
xxq250 fc4db3bb9a Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus 
# Conflicts:
#	app/controllers/application_controller.rb
#	app/controllers/pull_requests_controller.rb
#	app/controllers/users_controller.rb
#	app/models/ci/user.rb
#	app/models/gitea/pull.rb
#	app/models/gitea/webhook.rb
#	app/models/gitea/webhook_task.rb
#	app/models/organization.rb
#	app/models/project.rb
#	app/models/project_category.rb
#	app/models/user.rb
#	app/services/projects/create_service.rb
 2023-01-12 17:51:48 +08:00
xxq250 9065029d08 Merge branch 'master' into sponsor 
# Conflicts:
#	.gitignore
#	Gemfile
#	Gemfile.lock
#	app/controllers/accounts_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/compare_controller.rb
#	app/controllers/journals_controller.rb
#	app/controllers/members_controller.rb
#	app/controllers/pull_requests_controller.rb
#	app/controllers/settings_controller.rb
#	app/controllers/users_controller.rb
#	app/controllers/version_releases_controller.rb
#	app/models/gitea/webhook_task.rb
#	app/models/message_template/pull_request_atme.rb
#	app/models/project.rb
#	app/models/project_category.rb
#	app/models/user_extension.rb
#	app/views/users/get_user_info.json.jbuilder
#	app/views/users/show.json.jbuilder
#	config/routes.rb
 2023-01-12 17:33:18 +08:00
yystopf e1c600a2f5 更改：分页大小最高限制为50 2023-01-05 15:40:03 +08:00
xxq250 4e244bed3a 增加手机验证码校验 2022-11-24 14:28:49 +08:00
xxq250 fd2b20ed87 个人资料修改手机号 2022-11-24 11:09:58 +08:00
“xxq250” 134a395ffa fixed 区分找回密码邮件标题 2022-11-15 14:31:18 +08:00
“xxq250” 518f373b88 增加ucloud短信发送通道 2022-11-15 10:03:01 +08:00
“xxq250” a4c892ec0a fixed cloudIDE saas定制api 2022-10-25 11:19:59 +08:00
“xxq250” 4cc4ed5864 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-10-21 09:42:27 +08:00
“xxq250” 0a5dd2f1ee ssh公钥允许token请求 2022-10-21 09:42:21 +08:00
viletyy 2df259c927 Merge branch 'develop' into standalone_develop 2022-10-14 15:02:53 +08:00
yystopf 83f1263f85 修复：更改查询项目判断条件 2022-10-14 14:52:25 +08:00
“xxq250” d51bb7030f Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/views/users/get_user_info.json.jbuilder
 2022-08-30 18:14:17 +08:00
“xxq250” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
yystopf 5c5b4b5d92 新增：分页数量限制修改 2022-08-24 10:30:23 +08:00
“xxq250” 5be93d5de8 关闭rack-mini-profiler 2022-07-26 16:32:53 +08:00
yystopf 24d83133e7 新增: 创建分支接口 2022-07-15 14:02:48 +08:00
xiaoxiaoqiong 25375b32c2 fixed oauth2 请求区别 2022-07-13 12:47:39 +08:00
xiaoxiaoqiong 915e689ef9 oauth2 增加client方式 2022-07-11 18:19:08 +08:00
yystopf 221c439a1d 修复: oauth2 token 私有仓库无法获取用户信息 2022-07-11 17:11:13 +08:00
xiaoxiaoqiong 620d2eeb51 auth token 接入验证登录接口 2022-06-28 10:09:26 +08:00
xiaoxiaoqiong d97888ad16 auth token 接入验证登录接口 2022-06-28 10:02:39 +08:00
xiaoxiaoqiong 41eedff819 auth token 接入验证登录接口 2022-06-27 18:05:46 +08:00
yystopf d6bbc7554f Merge branch 'develop' into standalone_develop 2022-06-20 16:38:06 +08:00
yystopf ba1fa8b685 修复: 项目邀请链接私有项目无法访问的情况 2022-06-20 16:37:59 +08:00
yystopf 7ba77680ac Merge branch 'develop' into standalone_develop 2022-06-20 16:36:10 +08:00
yystopf 29e3a55a0c 修复: 项目邀请链接私有项目无法访问的情况 2022-06-20 16:36:01 +08:00
yystopf 7e5d5e31e5 merge from develop 2022-06-20 10:21:10 +08:00
xiaoxiaoqiong 1f9caeece5 auth2接入 2022-06-17 17:02:24 +08:00
Xunhui Zhang 8cf576946b merge conflicts 2022-05-06 21:48:59 +08:00
yystopf f76dad680a Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop 2022-01-07 18:03:57 +08:00
yystopf 499734ebf9 fix: upload user image allow base64 2022-01-04 22:44:39 +08:00
xiaoxiaoqiong 0619c5a4d9 开启dubug 2021-12-29 14:23:51 +08:00
qyzh 0f776c5cdb update user.last_login_on before every requests 2021-12-24 15:25:14 +08:00
qyzh fc3f50a2bf add column to statistics 2021-12-24 15:14:26 +08:00
jasder 651bf34cfc FIX code review and conflict 2021-11-14 20:50:22 +08:00