Merge pull request #600 from wwitzel3/django111

Upgrade AWX major dependencies
This commit is contained in:
Wayne Witzel III
2017-11-13 12:26:04 -05:00
committed by GitHub
103 changed files with 1863 additions and 1288 deletions

View File

@@ -1,11 +1,17 @@
# Copyright (c) 2015 Ansible, Inc.
# All Rights Reserved.
from django.conf import settings
from django.conf.urls import *
urlpatterns = patterns('awx.ui.views',
url(r'^$', 'index', name='index'),
url(r'^migrations_notran/$', 'migrations_notran', name='migrations_notran'),
url(r'^portal/$', 'portal_redirect', name='portal_redirect'),
from django.conf.urls import url
from awx.ui.views import (
index,
portal_redirect,
migrations_notran,
)
app_name = 'ui'
urlpatterns = [
url(r'^$', index, name='index'),
url(r'^migrations_notran/$', migrations_notran, name='migrations_notran'),
url(r'^portal/$', portal_redirect, name='portal_redirect'),
]