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:
yystopf 2022-06-20 16:36:10 +08:00
parent 79cbeb846b 29e3a55a0c
commit 7ba77680ac
2 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/application_controller.rb
View File

@ -684,7 +684,7 @@ class ApplicationController < ActionController::Base
@project, @owner = Project.find_with_namespace(namespace, id) @project, @owner = Project.find_with_namespace(namespace, id)
if @project and current_user.can_read_project?(@project) if @project and current_user.can_read_project?(@project) and controller_path == "projects/project_invite_links"
logger.info "###########： has project and can read project" logger.info "###########： has project and can read project"
@project @project
# elsif @project && current_user.is_a?(AnonymousUser) # elsif @project && current_user.is_a?(AnonymousUser)

4
config/initializers/doorkeeper.rb
View File

@ -101,12 +101,12 @@ Doorkeeper.configure do
# Authorization Code expiration time (default: 10 minutes). # Authorization Code expiration time (default: 10 minutes).
# #
# authorization_code_expires_in 10.minutes authorization_code_expires_in 7.days
# Access token expiration time (default: 2 hours). # Access token expiration time (default: 2 hours).
# If you want to disable expiration, set this to `nil`. # If you want to disable expiration, set this to `nil`.
# #
# access_token_expires_in 2.hours access_token_expires_in 7.days
# Assign custom TTL for access tokens. Will be used instead of access_token_expires_in # Assign custom TTL for access tokens. Will be used instead of access_token_expires_in
# option if defined. In case the block returns `nil` value Doorkeeper fallbacks to # option if defined. In case the block returns `nil` value Doorkeeper fallbacks to