floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-22 12:45:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

Browse Source
This commit is contained in:
Jasder
2020-07-02 15:50:50 +08:00
parent c1a5c390f7 7e99c0fc88
commit 04f98f1c10
6 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pull_requests_controller.rb
View File

@@ -174,7 +174,7 @@ class PullRequestsController < ApplicationController
end
def show
@user_permission = current_user.present? && current_user.logged? && (@issue.assigned_to_id == current_user.id || current_user.admin? )
@user_permission = current_user.present? && current_user.logged? && (@issue.assigned_to_id == current_user.id || @project.user_id == current_user.id || @project.manager?(current_user) )
@issue_user = @issue.user
@issue_assign_to = @issue.get_assign_user

2
app/controllers/repositories_controller.rb
View File

@@ -97,7 +97,7 @@ class RepositoriesController < ApplicationController
end
def sync_mirror
return render_error("正在镜像中..") if @repo.mirror.warning?
return render_error("正在镜像中..") if @repo.mirror.waiting?
@repo.sync_mirror!
SyncMirroredRepositoryJob.perform_later(@repo.id, current_user.id)