diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index dd19a515b..5528e5842 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -684,7 +684,7 @@ class ApplicationController < ActionController::Base @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" @project # elsif @project && current_user.is_a?(AnonymousUser) diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 4f9db8cdf..d80dcac68 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -101,12 +101,12 @@ Doorkeeper.configure do # 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). # 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 # option if defined. In case the block returns `nil` value Doorkeeper fallbacks to