Commit 01fd71ad authored by Luke Bennett's avatar Luke Bennett Committed by Bob Van Landuyt

Add read_instance_statistics global policy

parent 626d5caf
...@@ -2,11 +2,7 @@ class InstanceStatistics::ApplicationController < ApplicationController ...@@ -2,11 +2,7 @@ class InstanceStatistics::ApplicationController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
layout 'instance_statistics' layout 'instance_statistics'
def index
redirect_to instance_statistics_conversations_development_index_index_path
end
def authenticate_user! def authenticate_user!
render_404 if ApplicationSettingsHelper.hide_instance_statistics?(current_user) render_404 unless can?(current_user, :read_instance_statistics)
end end
end end
...@@ -15,10 +15,6 @@ module ApplicationSettingsHelper ...@@ -15,10 +15,6 @@ module ApplicationSettingsHelper
def allowed_protocols_present? def allowed_protocols_present?
Gitlab::CurrentSettings.enabled_git_access_protocol.present? Gitlab::CurrentSettings.enabled_git_access_protocol.present?
end end
def hide_instance_statistics?(user = current_user)
Gitlab::CurrentSettings.instance_statistics_visibility_private? && !user.admin?
end
def enabled_protocol def enabled_protocol
case Gitlab::CurrentSettings.enabled_git_access_protocol case Gitlab::CurrentSettings.enabled_git_access_protocol
......
...@@ -19,6 +19,9 @@ class GlobalPolicy < BasePolicy ...@@ -19,6 +19,9 @@ class GlobalPolicy < BasePolicy
@user&.required_terms_not_accepted? @user&.required_terms_not_accepted?
end end
condition(:private_instance_statistics, score: 0) { Gitlab::CurrentSettings.instance_statistics_visibility_private? }
rule { admin | ~private_instance_statistics }.enable :read_instance_statistics
rule { anonymous }.policy do rule { anonymous }.policy do
prevent :log_in prevent :log_in
prevent :receive_notifications prevent :receive_notifications
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
= nav_link(controller: 'admin/dashboard') do = nav_link(controller: 'admin/dashboard') do
= link_to admin_root_path, class: 'admin-icon qa-admin-area-link', title: _('Admin area'), aria: { label: _("Admin area") }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to admin_root_path, class: 'admin-icon qa-admin-area-link', title: _('Admin area'), aria: { label: _("Admin area") }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= sprite_icon('admin', size: 18) = sprite_icon('admin', size: 18)
- unless hide_instance_statistics? - if can?(current_user, :read_instance_statistics)
= nav_link(controller: :instance_statistics) do = nav_link(controller: :instance_statistics) do
= link_to instance_statistics_root_path, title: 'Instance statistics', aria: { label: 'Instance statistics' }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to instance_statistics_root_path, title: 'Instance statistics', aria: { label: 'Instance statistics' }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= sprite_icon('chart', size: 18) = sprite_icon('chart', size: 18)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment