From fa56c34b478c39639abfc51fbde6f55b5641ab1e Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Tue, 5 Jul 2016 15:24:10 -0600 Subject: Remove background_jobs-specific headers. --- app/controllers/admin/background_jobs_controller.rb | 2 -- config/initializers/secure_headers.rb | 5 ----- 2 files changed, 7 deletions(-) diff --git a/app/controllers/admin/background_jobs_controller.rb b/app/controllers/admin/background_jobs_controller.rb index 133c6bc012b..338496013a0 100644 --- a/app/controllers/admin/background_jobs_controller.rb +++ b/app/controllers/admin/background_jobs_controller.rb @@ -1,7 +1,5 @@ class Admin::BackgroundJobsController < Admin::ApplicationController def show - use_secure_headers_override(:background_jobs) - ps_output, _ = Gitlab::Popen.popen(%W(ps -U #{Gitlab.config.gitlab.user} -o pid,pcpu,pmem,stat,start,command)) @sidekiq_processes = ps_output.split("\n").grep(/sidekiq/) end diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb index 6cc7484d748..a704dd2ee7e 100644 --- a/config/initializers/secure_headers.rb +++ b/config/initializers/secure_headers.rb @@ -50,8 +50,3 @@ SecureHeaders::Configuration.default do |config| config.csp[:script_src] << "maxcdn.bootstrapcdn.com" end end - -SecureHeaders::Configuration.override(:background_jobs) do |config| - config.csp[:frame_ancestors] = %w('self') - config.x_frame_options = 'SAMEORIGIN' -end -- cgit v1.2.1