Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
0dddf9eb
Commit
0dddf9eb
authored
Aug 03, 2017
by
Michael Roytman
Committed by
GitHub
Aug 03, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15660 from edx/mroytman/PLAT_1495_django_1.11_upgrade_django-debug-toolbar
update django-debug-toolbar from 1.5 to 1.8
parents
8463dd49
54f4a9de
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 additions
and
9 deletions
+1
-9
cms/envs/devstack.py
+0
-4
lms/envs/devstack.py
+0
-4
requirements/edx/base.txt
+1
-1
No files found.
cms/envs/devstack.py
View file @
0dddf9eb
...
...
@@ -86,7 +86,6 @@ DEBUG_TOOLBAR_CONFIG = {
'debug_toolbar.panels.profiling.ProfilingPanel'
,
),
'SHOW_TOOLBAR_CALLBACK'
:
'cms.envs.devstack.should_show_debug_toolbar'
,
'JQUERY_URL'
:
None
,
}
...
...
@@ -94,9 +93,6 @@ def should_show_debug_toolbar(request):
# We always want the toolbar on devstack unless running tests from another Docker container
if
request
.
get_host
()
.
startswith
(
'edx.devstack.studio:'
):
return
False
# Only display for non-ajax requests.
if
request
.
is_ajax
():
return
False
return
True
...
...
lms/envs/devstack.py
View file @
0dddf9eb
...
...
@@ -83,7 +83,6 @@ DEBUG_TOOLBAR_PANELS = (
DEBUG_TOOLBAR_CONFIG
=
{
'SHOW_TOOLBAR_CALLBACK'
:
'lms.envs.devstack.should_show_debug_toolbar'
,
'JQUERY_URL'
:
None
,
}
...
...
@@ -91,9 +90,6 @@ def should_show_debug_toolbar(request):
# We always want the toolbar on devstack unless running tests from another Docker container
if
request
.
get_host
()
.
startswith
(
'edx.devstack.lms:'
):
return
False
# Only display for non-ajax requests.
if
request
.
is_ajax
():
return
False
return
True
########################### PIPELINE #################################
...
...
requirements/edx/base.txt
View file @
0dddf9eb
...
...
@@ -149,7 +149,7 @@ ipaddr==2.1.11
django-cors-headers==1.1.0
# Debug toolbar
django_debug_toolbar==1.
5
django_debug_toolbar==1.
8
sqlparse>=0.2.0,<0.3.0
# Used for testing
...
...
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