Switch to unified view

a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
...
...
64
    def __init__(self):
64
    def __init__(self):
65
        self.preferences = PreferencesController()
65
        self.preferences = PreferencesController()
66
        self.user_info = UserInfoController()
66
        self.user_info = UserInfoController()
67
        self.subscriptions = SubscriptionsController()
67
        self.subscriptions = SubscriptionsController()
68
        self.oauth = OAuthController()
68
        self.oauth = OAuthController()
69
70
    @expose()
71
    def prefs(self, *args, **kwargs):
72
        '''
73
        Redirect old /auth/prefs URL to /auth/subscriptions
74
        (to handle old email links, etc).
75
        '''
76
        redirect('subscriptions')
69
77
70
    @expose('jinja:allura:templates/login.html')
78
    @expose('jinja:allura:templates/login.html')
71
    @with_trailing_slash
79
    @with_trailing_slash
72
    def index(self, *args, **kwargs):
80
    def index(self, *args, **kwargs):
73
        orig_request = request.environ.get('pylons.original_request', None)
81
        orig_request = request.environ.get('pylons.original_request', None)