floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into standalone_develop

This commit is contained in:
viletyy 2022-10-17 10:25:47 +08:00
parent 732d1a1adb 53fe554d1e
commit 77ec7e5a69
2 changed files with 267 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/admin.scss
View File

@ -205,3 +205,9 @@ input.form-control {
font-size: 1rem; font-size: 1rem;
} }
} }
.table th, .table td {
padding: 0.75rem 0.1rem;
vertical-align: top;
border-top: 1px solid #dee2e6;
}

2
app/controllers/attachments_controller.rb
View File

@ -220,7 +220,7 @@ class AttachmentsController < ApplicationController
candown = course.member?(current_user) || course.is_public candown = course.member?(current_user) || course.is_public
elsif @file.container.is_a?(Journal) elsif @file.container.is_a?(Journal)
course = @file.container.issue.project course = @file.container.issue.project
candown = course.member?(current_user) candown = course.member?(current_user) || course.is_public
else else
course = nil course = nil
end end