Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
fa56c34b
Commit
fa56c34b
authored
Jul 05, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove background_jobs-specific headers.
parent
3ee8eb11
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
7 deletions
+0
-7
app/controllers/admin/background_jobs_controller.rb
app/controllers/admin/background_jobs_controller.rb
+0
-2
config/initializers/secure_headers.rb
config/initializers/secure_headers.rb
+0
-5
No files found.
app/controllers/admin/background_jobs_controller.rb
View file @
fa56c34b
class
Admin::BackgroundJobsController
<
Admin
::
ApplicationController
class
Admin::BackgroundJobsController
<
Admin
::
ApplicationController
def
show
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)
)
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/
)
@sidekiq_processes
=
ps_output
.
split
(
"
\n
"
).
grep
(
/sidekiq/
)
end
end
...
...
config/initializers/secure_headers.rb
View file @
fa56c34b
...
@@ -50,8 +50,3 @@ SecureHeaders::Configuration.default do |config|
...
@@ -50,8 +50,3 @@ SecureHeaders::Configuration.default do |config|
config
.
csp
[
:script_src
]
<<
"maxcdn.bootstrapcdn.com"
config
.
csp
[
:script_src
]
<<
"maxcdn.bootstrapcdn.com"
end
end
end
end
SecureHeaders
::
Configuration
.
override
(
:background_jobs
)
do
|
config
|
config
.
csp
[
:frame_ancestors
]
=
%w('self')
config
.
x_frame_options
=
'SAMEORIGIN'
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment