Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mozilla/kuma
...
head fork: mozilla/kuma
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 2 contributors
Commits on Apr 01, 2013
@groovecoder groovecoder remove admin-media and ADMIN_MEDIA_PREFIX
--noinput on collectstatic for dev server
7e429e9
Commits on Apr 03, 2013
@darkwing darkwing Merge pull request #975 from groovecoder/django-admin-static
remove admin-media and ADMIN_MEDIA_PREFIX
e93b53e
View
1  puppet/files/etc/apache2/conf.d/mozilla-kuma-apache.conf
@@ -35,7 +35,6 @@ WSGISocketPrefix /var/run/wsgi
Alias /media/ "/vagrant/media/"
Alias /static/ "/vagrant/static/"
Alias /uploads/ "/home/vagrant/uploads/"
- Alias /admin-media/ "/vagrant/vendor/src/django/django/contrib/admin/media/"
# This runs the python app through mod_wsgi
# More like prod, but requires a `touch /vagrant/wsgi/*` to refresh code
View
2  scripts/update_site.py
@@ -89,7 +89,7 @@ def update_site(env, debug):
(CHDIR, os.path.join(here)),
(EXEC, 'python2.6 vendor/src/schematic/schematic migrations/'),
(EXEC, 'python2.6 manage.py migrate'),
- (EXEC, 'python2.6 manage.py collectstatic'),
+ (EXEC, 'python2.6 manage.py collectstatic --noinput'),
(EXEC, 'LANG=en_US.UTF-8 python2.6 manage.py compress_assets'),
]
View
5 settings.py
@@ -297,11 +297,6 @@ def lazy_language_deki_map():
SERVE_MEDIA = False
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/admin-media/'
-
# Paths that don't require a locale prefix.
SUPPORTED_NONLOCALES = ('media', 'admin', 'robots.txt', 'services', 'static',
'1', 'files', '@api', )

No commit comments for this range

Something went wrong with that request. Please try again.