Merge branch 'patricio-wip-11' into patricio-deploy-proxy

app/Http/Controllers/ApplicationController.php

@@ -57,7 +57,13 @@ class ApplicationController extends Controller
             return redirect()->route('dashboard');
         }
         $activity = Activity::where('properties->type_uuid', '=', $deployment_uuid)->first();
-
+        if (!$activity) {
+            return redirect()->route('project.application.deployments', [
+                'project_uuid' => $project->uuid,
+                'environment_name' => $environment->name,
+                'application_uuid' => $application->uuid,
+            ]);
+        }
         return view('project.application.deployment', [
             'application' => $application,
             'activity' => $activity,