Compare commits

..

3 Commits

Author SHA1 Message Date
vilet.yy 5c864acb64 fix: create repo not use website 2021-03-22 15:50:08 +08:00
vilet.yy 8bbfea2079 fix 2021-03-22 11:18:04 +08:00
vilet.yy 8c2a543e61 fix: project code change to default 2021-03-22 11:16:35 +08:00
6 changed files with 18 additions and 35 deletions

View File

@ -1,17 +1,6 @@
# Changelog
## [v3.0.1](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-03-19
* BUGFIXES
* Fix pull reqeust模块中用户头像显示问题
* Fix 解决issue模块中指派用户的问题
* Fix 解决合并请求失败的后显示message信息不正确
* Fix 代码目录页面readme文件提供单独的api
* ENHANCEMENTS
* 重构项目详情页面
## [v3.0.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2020-12-29
## [v3.0.0](https://github.com/go-gitea/gitea/releases/tag/v1.13.1) - 2020-12-29
* BUGFIXES
* Fix pull reqeust的访问权限问题 (#14156) (#14171)

View File

@ -93,26 +93,26 @@ http://localhost:3000/
- 代码库
![](docs/figs/code.png?raw=true)
![](docs/figs/code.png)
- 任务管理
![](docs/figs/issue_manage.png?raw=true)
![](docs/figs/issue_manage.png)
- 任务查看
![](docs/figs/issue_view.png?raw=true)
![](docs/figs/issue_view.png)
- 任务指派
![](docs/figs/issue_assign2.png?raw=true)
![](docs/figs/issue_assign2.png)
- 里程碑
![](docs/figs/milestone.png?raw=true)
![](docs/figs/milestone.png)
### API
- [API文档](https://forgeplus.trustie.net/docs/api)
- [API](api_document.md)
- [API](showdoc.com.cn)
账号forgeplus@admin.com 密码forge123

View File

@ -11,7 +11,7 @@ class ProjectsController < ApplicationController
menu = []
menu.append(menu_hash_by_name("home"))
menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code")
menu.append(menu_hash_by_name("code"))
menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls")
menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops")
@ -26,7 +26,7 @@ class ProjectsController < ApplicationController
scope = Projects::ListQuery.call(params)
# @projects = kaminari_paginate(scope)
@projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner)
@projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
category_id = params[:category_id]
@total_count =

View File

@ -18,7 +18,6 @@ class RepositoriesController < ApplicationController
# 新版项目详情
def detail
return render_not_found unless @project.has_menu_permission("code")
@user = current_user
@result = Repositories::DetailService.call(@owner, @repository, @user)
@project_fork_id = @project.try(:forked_from_project_id)

View File

@ -46,7 +46,6 @@ class Projects::CreateService < ApplicationService
{
hidden: !repo_is_public,
user_id: params[:user_id],
website: params[:website],
identifier: params[:repository_name]
}
end

View File

@ -1,10 +1,6 @@
json.content @project.content
json.website @project.website
if @result[:readme].blank?
json.readme nil!
else
json.readme @result[:readme].merge(content: readme_render_decode64_content(@result[:readme]["content"], nil))
end
json.readme @result[:readme].merge(content: readme_render_decode64_content(@result[:readme]["content"], nil))
json.identifier render_identifier(@project)
json.name @project.name
json.project_id @project.id
@ -52,7 +48,7 @@ if @result[:repo]
json.private @result[:repo]['private']
end
json.license_name @project.license_name
json.release_versions do
json.release_versions do
json.list @result[:release].each do |release|
forge_version = VersionRelease.find_by(version_gid: release["id"])
json.id forge_version&.id
@ -62,23 +58,23 @@ json.release_versions do
end
json.total_count @result[:release].size
end
json.branches do
json.branches do
json.list @result[:branch].each do |branch|
json.name branch["name"]
end
json.total_count @result[:branch].size
end
json.tags do
json.list @result[:tag].each do |tag|
json.tags do
json.list @result[:tag].each do |tag|
json.name tag["name"]
end
json.total_count @result[:tag].size
json.total_count @result[:tag].size
end
json.contributors do
total_count = @result[:contributor].size
json.contributors do
total_count = @result[:contributor].size
json.list @result[:contributor].each do |contributor|
user = User.find_by(gitea_uid: contributor["id"])
if contributor["login"] == "root"
if contributor["login"] == "root"
total_count -= 1
next
end