summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-02-09 17:32:08 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-02-09 17:32:08 +0000
commit482e7ff01201dba89a13f5e9979ea17c202c87c7 (patch)
tree22bd0b2c8dfcd5fe2a534016f6c07b3b0c3da8c4
parent19bac884c67acebcc0e6dda2a3df824049b1f726 (diff)
downloadgitlab-ce-482e7ff01201dba89a13f5e9979ea17c202c87c7.tar.gz
Fix broken test and linter error
-rw-r--r--app/assets/javascripts/environments/components/environment_item.js.es62
-rw-r--r--spec/javascripts/environments/mock_data.js.es62
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index cf79969471e..d0c5a343d71 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -97,7 +97,7 @@ module.exports = Vue.component('environment-item', {
* @returns {Boolean}
*/
hasStopAction() {
- return this.model['stop_action?'];
+ return this.model.latest['stop_action?'];
},
/**
diff --git a/spec/javascripts/environments/mock_data.js.es6 b/spec/javascripts/environments/mock_data.js.es6
index bdecc95d219..081897f5456 100644
--- a/spec/javascripts/environments/mock_data.js.es6
+++ b/spec/javascripts/environments/mock_data.js.es6
@@ -55,5 +55,5 @@ const environment = {
module.exports = {
environmentsList,
- environment
+ environment,
};