diff options
author | Luke Bennett <lbennett@gitlab.com> | 2018-09-06 12:43:14 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-09-06 12:43:14 +0000 |
commit | 7e7ca9faf1f8270d54f7731747db0d44c928492c (patch) | |
tree | 64294529de4536a0cc2e66dbc6bdd6c9f5547ae3 /app/controllers | |
parent | 55b5264043bdecbbb5971c55c27ccbbeb0eb041e (diff) | |
download | gitlab-ce-7e7ca9faf1f8270d54f7731747db0d44c928492c.tar.gz |
Resolve "Remove usage ping payload from Cohorts, add to Settings"
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/instance_statistics/cohorts_controller.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/instance_statistics/cohorts_controller.rb b/app/controllers/instance_statistics/cohorts_controller.rb index 7eba0a5ecdd..4b4e39db2e1 100644 --- a/app/controllers/instance_statistics/cohorts_controller.rb +++ b/app/controllers/instance_statistics/cohorts_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class InstanceStatistics::CohortsController < InstanceStatistics::ApplicationController + before_action :authenticate_usage_ping_enabled_or_admin! + def index if Gitlab::CurrentSettings.usage_ping_enabled cohorts_results = Rails.cache.fetch('cohorts', expires_in: 1.day) do @@ -10,4 +12,8 @@ class InstanceStatistics::CohortsController < InstanceStatistics::ApplicationCon @cohorts = CohortsSerializer.new.represent(cohorts_results) end end + + def authenticate_usage_ping_enabled_or_admin! + render_404 unless Gitlab::CurrentSettings.usage_ping_enabled || current_user.admin? + end end |