Changeset 12563 for stable/HeuristicLab.Services.WebApp/3.3/Controllers/AppController.cs

Timestamp:

07/01/15 14:59:47 (9 years ago)

Author:

ascheibe

Message:

#2394 merged r12428, r12429, r12430, r12435, r12442, r12443, r12445, r12514, r12517, r12519, r12520, r12521, r12523, r12532, r12542, r12546, r12552, r12553, r12556, r12557, r12559, r12561, r12146, r12457 into stable

Location:

stable

Files:

• . (modified) (2 props)
• HeuristicLab.Services.WebApp (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp)
• HeuristicLab.Services.WebApp/3.3/Controllers/AppController.cs (modified) (3 diffs)

stable/HeuristicLab.Services.WebApp/3.3/Controllers/AppController.cs

@@ -21 +21 @@
 
 using System.Web.Mvc;
-using HeuristicLab.Services.WebApp.Configs;
 
 namespace HeuristicLab.Services.WebApp.Controllers {
@@ -31 +30 @@
         return RedirectPermanent(Request.Url + "/");
       }
-      BundleConfig.AddOrUpdateWebAppBundle();
       return View("~/WebApp/shared/layout/layout.cshtml");
     }
@@ -49 +47 @@
     }
 
+    public ActionResult RedirectUrl(string url) {
+      return RedirectPermanent(url);
+    }
   }
 }