jindian114514
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'standalone_develop' into pre_trustie_server

This commit is contained in:
yystopf 2026-02-27 15:35:16 +08:00
parent dce9f3a35a 89eb4c2393
commit 3d70f0d447
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -5,7 +5,7 @@ class UsersController < ApplicationController
before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard, :hovercard4proj]
before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard, :hovercard4proj]
before_action :require_login, only: %i[me sync_user_info]
before_action :connect_to_ci_db, only: [:get_user_info]
# before_action :connect_to_ci_db, only: [:get_user_info]
before_action :convert_image!, only: [:update, :update_image]
skip_before_action :check_sign, only: [:attachment_show]
before_action :sso_login, only: [:get_user_info]

2
app/views/admins/organizations/shared/_project_list.html.erb
View File

@ -27,7 +27,7 @@
</td>
<td><%= project.is_public ? '√' : '' %></td>
<td><%= project.recommend ? '√' : '' %></td>
<td><%= project.issues.size %></td>
<td><%= project.issues.issue_issue.size %></td>
<td><%= project.attachments.size %></td>
<td><%= project&.pull_requests_count %></td>
<td><%= project.versions.size %></td>

2
app/views/admins/projects/shared/_list.html.erb
View File

@ -28,7 +28,7 @@
</td>
<td><%= project.is_public ? '√' : '' %></td>
<td><%= project.recommend ? '√' : '' %></td>
<td><%= project.issues.size %></td>
<td><%= project.issues.issue_issue.size %></td>
<td><%= project.attachments.size %></td>
<td><%= project&.pull_requests_count %></td>
<td><%= project.versions.size %></td>