diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:42:17 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:42:17 +0000 |
commit | 44fdf983bd35328dd577d3d3650d14163ef3e2b6 (patch) | |
tree | 84ff300d056cfbabb5a0fe2a9cbaa80aaeab1cc5 /app/controllers | |
parent | bc9fa07b26184b5c94808f704db6ea1ac81bf4de (diff) | |
download | gitlab-ce-44fdf983bd35328dd577d3d3650d14163ef3e2b6.tar.gz |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/explore/application_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/help_controller.rb | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c5c586ea489..b2496427924 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -496,6 +496,10 @@ class ApplicationController < ActionController::Base html_request? && !devise_controller? end + def public_visibility_restricted? + Gitlab::CurrentSettings.restricted_visibility_levels.include? Gitlab::VisibilityLevel::PUBLIC + end + def set_usage_stats_consent_flag return unless current_user return if sessionless_user? diff --git a/app/controllers/explore/application_controller.rb b/app/controllers/explore/application_controller.rb index 8eee3742d89..9d33135d4c1 100644 --- a/app/controllers/explore/application_controller.rb +++ b/app/controllers/explore/application_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Explore::ApplicationController < ApplicationController - skip_before_action :authenticate_user! + skip_before_action :authenticate_user!, unless: :public_visibility_restricted? layout 'explore' end diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 97895d6461c..91bba1eb617 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class HelpController < ApplicationController - skip_before_action :authenticate_user! + skip_before_action :authenticate_user!, unless: :public_visibility_restricted? layout 'help' |