KingChan
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,997 Commits 67 Branches 0 Tags 728 MiB
Commit Graph

66 Commits

Author SHA1 Message Date
yystopf a7ea0436e4 Merge branch 'standalone_develop' into dev_osredm_server 2025-06-24 16:56:29 +08:00
yystopf 6a7174781c 新增：重新打开pr接口 2025-06-23 19:27:47 +08:00
xxq250 b760d17988 Merge branch 'standalone_develop' into dev_osredm_server 
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/admins/users_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/owners_controller.rb
#	app/helpers/application_helper.rb
#	app/helpers/avatar_helper.rb
#	app/models/edu_setting.rb
#	app/models/user.rb
#	app/models/user_action.rb
#	app/views/layouts/admin.html.erb
#	app/views/projects/index.json.jbuilder
#	config/harmonious_dictionary/chinese_dictionary.txt
#	config/harmonious_dictionary/harmonious.hash
#	config/harmonious_dictionary/harmonious_english.yml
#	config/routes/api.rb
 2025-03-20 14:32:54 +08:00
yystopf a4f2243a7a 新增：pr列表返回创建时间戳 2024-10-27 19:58:38 +08:00
xxq250 098b045315 fixed 删除用户图标 2024-10-11 15:01:32 +08:00
xxq250 c8e9c705f3 fixed 删除用户图标 2024-10-11 14:57:06 +08:00
xxq250 1233daa466 fixed 删除用户时issue，pr用户显示已注销 2024-10-09 16:16:52 +08:00
xxq250 71bdde79ef fixed 删除用户时issue，pr用户显示已注销 2024-10-09 15:55:42 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf c9df8fa3fe 新增：存储pull_request源仓库信息 2024-07-19 11:17:15 +08:00
yystopf 90fa4774d8 新增：时间返回 2024-07-04 15:09:22 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
xxq250 78b2c80bec fixed PR中合并来源显示错误,列表 2023-08-11 17:33:26 +08:00
xxq250 f0b7618b3d fixed PR中合并来源显示错误 2023-08-11 17:22:55 +08:00
chenjing 4077de7360 fix cla error for pr 2023-06-16 16:27:07 +08:00
xxqfamous d407b3c674 禁止pr访问标识 2023-06-16 10:20:37 +08:00
chenjing fb4a44a6fa cla pr and destroy user_cla 2023-06-16 10:20:06 +08:00
xxqfamous a6fa3f9354 禁止pr访问标识 2023-06-07 11:45:50 +08:00
xxqfamous aad2db5c5b 禁止pr访问标识 2023-06-07 11:03:49 +08:00
yystopf e1ae872093 Merge branch 'develop' into standalone_develop 2023-03-28 15:52:02 +08:00
yystopf 4bf14974df 新增：项目是否创建了pr参数 2023-03-28 15:51:51 +08:00
yystopf 7fc373e259 新增：合并请求编辑返回关联issue数据 2023-03-10 14:49:20 +08:00
yystopf bd855ea4ed 新增：合并请求列表返回关联issue数据 2023-03-10 14:48:53 +08:00
yystopf 129d2651b2 新增：合并请求详情新增关联疑修返回 2023-03-10 14:48:53 +08:00
“xxq250” cb302b50dd Merge branch 'develop' into dev_jk_server 
# Conflicts:
#	app/assets/javascripts/admin.js
#	app/controllers/accounts_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/attachments_controller.rb
#	app/controllers/concerns/login_helper.rb
#	app/controllers/concerns/register_helper.rb
#	app/controllers/concerns/render_helper.rb
#	app/controllers/concerns/repository/languages_percentagable.rb
#	app/controllers/repositories_controller.rb
#	app/controllers/users/is_pinned_projects_controller.rb
#	app/controllers/users_controller.rb
#	app/docs/slate/source/api.html.md
#	app/docs/slate/source/includes/_projects.md
#	app/docs/slate/source/includes/_pulls.md
#	app/docs/slate/source/includes/_repositories.md
#	app/docs/slate/source/includes/_teams.md
#	app/docs/slate/source/includes/_users.md
#	app/helpers/application_helper.rb
#	app/imports/admins/new_import_user_from_excel.rb
#	app/libs/custom_regexp.rb
#	app/models/journal.rb
#	app/models/project.rb
#	app/models/user.rb
#	app/queries/admins/user_query.rb
#	app/services/admins/import_user_from_excel_service.rb
#	app/views/admins/users/index.html.erb
#	app/views/members/index.json.jbuilder
#	app/views/settings/show.json.jbuilder
#	config/routes.rb
#	public/导入用户模板.xlsx
 2022-09-27 15:32:46 +08:00
“xxq250” 3ef6ed306f 项目详情增加时间语言 2022-09-20 15:06:27 +08:00
“xxq250” 9ab130f81e 项目详情增加时间语言 2022-09-20 15:04:32 +08:00
yystopf a35db9fe80 新增：reviewers修改入口 2022-07-26 16:45:53 +08:00
yystopf 1d6d48fc94 新增: pr 最后一次审核展示 2022-07-07 09:24:11 +08:00
yystopf a608803aa8 新增: 合并请求审查需审查权限 2022-06-30 11:00:18 +08:00
yystopf 12edc620df fix: complete profile condition 2021-12-24 16:15:59 +08:00
yystopf 7586a0fb21 fix: change issue tag change size 2021-11-29 10:27:41 +08:00
yystopf abca0fe432 fix: change pr path id to number 2021-11-25 15:08:59 +08:00
yystopf c4e88ad690 fix 2021-11-09 16:56:49 +08:00
yystopf e316a60433 fix: pullrequest fork_project_user_name 2021-11-09 16:56:49 +08:00
yystopf 28c3b4dda4 add: repo commit user use cache data 2021-11-02 09:59:21 +08:00
yystopf 8ba1198b4a fix: pr files commits count 2021-10-14 16:38:12 +08:00
yystopf 350502b499 fix: pullrequest create info 2021-10-11 10:07:35 +08:00
yystopf a22327d0df fix: add comments_total_count 2021-10-09 14:19:02 +08:00
yystopf 6e653f768a fix: pullrequest comments_count 2021-10-09 10:45:13 +08:00
yystopf 7d26fba3c0 add: pullrequest admin or developer 2021-08-26 17:56:19 +08:00
jasder b7dd12927b ADD conflicts file for pull api 2021-06-24 16:08:32 +08:00
jasder 67e49a4f56 FIX 修复pulls、issues 搜索数量统计问题 2021-06-18 10:52:14 +08:00
vilet.yy 880f09a94a fix: change pulls navbar count 2021-06-16 11:10:26 +08:00
jasder 8a47761afb ADD mergeable column for get pull api 2021-05-21 11:39:50 +08:00
vilet.yy 65d51e8578 add: project operate add organization team users 2021-04-28 15:15:45 +08:00
jasder 84e48d25c1 FIX render user bug with pull‘s commits and repo's commits api 2021-04-20 18:35:41 +08:00
vilet.yy c175fa1339 fix: commit author and fork create units 2021-04-02 18:53:53 +08:00
Jasder 36a3e36edb FIX pull api bug 2021-01-15 18:38:53 +08:00
Jasder fa01194d3c FIX [api] get pull bug 2021-01-12 17:34:07 +08:00