Close button

app/views/projects/environments/components/_actions.html.haml

 - if can?(current_user, :create_deployment, @project)
-  .inline{ "v-if" => "model.last_deployment.manual_actions && model.last_deployment.manual_actions.present"}
+  .inline{ "v-if" => "model.last_deployment && model.last_deployment.manual_actions && model.last_deployment.manual_actions.present"}
     .dropdown
       %a.dropdown-new.btn.btn-default{type: "button", "data-toggle" => "dropdown"}
         = custom_icon('icon_play')

app/views/projects/environments/components/_environment.html.haml

@@ -53,6 +53,8 @@
       .pull-right{ "v-if" => "!isFolder"}
         =render "projects/environments/components/external_url"
         =render "projects/environments/components/actions"
+        =render "projects/environments/components/stop"
+        =render "projects/environments/components/rollback"
       
   %tr{"v-if" => "open && isFolder", 
     "is" => "environment-item", 

app/views/projects/environments/components/_stop.html.haml

 - if can?(current_user, :create_deployment, @project)
-  .inline{ "v-if" => "environment.stop_action"}
-    -# TODO: Fix this link
-    -# link_to stop_namespace_project_environment_path(@project.namespace, @project, environment)
-    %a{":href" => "", 
+  .inline{ "v-if" => "model.stop_action" }
+    %a.btn.stop-env-link{":href" => "'#{namespace_project_environments_path(@project.namespace, @project)}/' + model.id", 
       "method" => ":post", 
       "rel" => "nofollow", "confirm" => "Are you sure you want to stop this environment?"}
-      = icon('stop', class: 'stop-env-icon')
+      = icon("stop", class: "stop-env-icon")