launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #06630
[Merge] lp:~rvb/maas/maas-remove-admindocs into lp:maas
Raphaël Badin has proposed merging lp:~rvb/maas/maas-remove-admindocs into lp:maas.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~rvb/maas/maas-remove-admindocs/+merge/96598
This branch removes the admindocs app that we don't use.
--
https://code.launchpad.net/~rvb/maas/maas-remove-admindocs/+merge/96598
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-remove-admindocs into lp:maas.
=== modified file 'src/maas/development.py'
--- src/maas/development.py 2012-03-05 15:13:25 +0000
+++ src/maas/development.py 2012-03-08 15:27:17 +0000
@@ -43,7 +43,6 @@
INSTALLED_APPS += (
'django.contrib.admin',
- 'django.contrib.admindocs',
'maastesting',
'debug_toolbar',
'django_nose',
=== modified file 'src/maas/settings.py'
--- src/maas/settings.py 2012-03-02 13:20:37 +0000
+++ src/maas/settings.py 2012-03-08 15:27:17 +0000
@@ -206,14 +206,11 @@
'maasserver',
'metadataserver',
'piston',
- # Uncomment the next line to enable admin documentation:
- # 'django.contrib.admindocs',
)
if DEBUG:
INSTALLED_APPS += (
'django.contrib.admin',
- 'django.contrib.admindocs',
)
# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
=== modified file 'src/maas/urls.py'
--- src/maas/urls.py 2012-03-01 16:23:38 +0000
+++ src/maas/urls.py 2012-03-08 15:27:17 +0000
@@ -38,6 +38,5 @@
admin.autodiscover()
urlpatterns += patterns('',
- (r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/', include(admin.site.urls)),
)