From 2431ca5e25ffee2e75e2280eca85cd84c4075b67 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 11 Nov 2014 14:37:53 -0500
Subject: [PATCH] Whitelist more loading routes, remove unneeded user loading
 route.

---
 app/assets/javascripts/discourse/ember/resolver.js.es6      | 2 +-
 app/assets/javascripts/discourse/routes/user-loading.js.es6 | 1 -
 app/assets/javascripts/discourse/views/user-loading.js.es6  | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/routes/user-loading.js.es6
 delete mode 100644 app/assets/javascripts/discourse/views/user-loading.js.es6

diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index 88cf9da9f6a..91da2a9ead7 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -3,7 +3,7 @@
 var classify = Ember.String.classify;
 var get = Ember.get;
 
-var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages'],
+var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags'],
     _dummyRoute,
     _loadingView;
 
diff --git a/app/assets/javascripts/discourse/routes/user-loading.js.es6 b/app/assets/javascripts/discourse/routes/user-loading.js.es6
deleted file mode 100644
index 9d032c9e3ba..00000000000
--- a/app/assets/javascripts/discourse/routes/user-loading.js.es6
+++ /dev/null
@@ -1 +0,0 @@
-export default Ember.Route.extend();
diff --git a/app/assets/javascripts/discourse/views/user-loading.js.es6 b/app/assets/javascripts/discourse/views/user-loading.js.es6
deleted file mode 100644
index 22cc259b248..00000000000
--- a/app/assets/javascripts/discourse/views/user-loading.js.es6
+++ /dev/null
@@ -1,3 +0,0 @@
-import LoadingView from 'discourse/views/loading';
-
-export default LoadingView;