From 903c81327f3e443a84ba24cfc68be635a3904722 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 21 Nov 2016 11:45:22 +0000
Subject: [PATCH 1/3] Remove v-html

---
 .../components/environment.js.es6             | 10 ++++----
 .../components/environment_actions.js.es6     |  7 +++---
 .../components/environment_item.js.es6        | 24 +++++++++++--------
 .../vue_common_component/commit.js.es6        | 16 ++++++-------
 .../environments/environment_item_spec.js.es6 |  2 +-
 5 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index b769161e058..33d00b7de65 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -158,16 +158,18 @@
               <a :href="projectEnvironmentsPath">
                 Available
                 <span
-                  class="badge js-available-environments-count"
-                  v-html="state.availableCounter"></span>
+                  class="badge js-available-environments-count">
+                  {{state.availableCounter}}
+                  </span>
               </a>
             </li>
             <li v-bind:class="{ 'active' : scope === 'stopped' }">
               <a :href="projectStoppedEnvironmentsPath">
                 Stopped
                 <span
-                  class="badge js-stopped-environments-count"
-                  v-html="state.stoppedCounter"></span>
+                  class="badge js-stopped-environments-count">
+                  {{state.stoppedCounter}}
+                  </span>
               </a>
             </li>
           </ul>
diff --git a/app/assets/javascripts/environments/components/environment_actions.js.es6 b/app/assets/javascripts/environments/components/environment_actions.js.es6
index edd39c02a46..39a2ed54e53 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js.es6
+++ b/app/assets/javascripts/environments/components/environment_actions.js.es6
@@ -43,8 +43,7 @@
       <div class="inline">
         <div class="dropdown">
           <a class="dropdown-new btn btn-default" data-toggle="dropdown">
-            <span class="dropdown-play-icon-container">
-            </span>
+            <span class="dropdown-play-icon-container"></span>
             <i class="fa fa-caret-down"></i>
           </a>
 
@@ -56,7 +55,9 @@
                 class="js-manual-action-link">
                 <span class="action-play-icon-container">
                 </span>
-                <span v-html="action.name"></span>
+                <span>
+                  {{action.name}}
+                </span>
               </a>
             </li>
           </ul>
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 2f7d1d2a177..6bac01632bf 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -392,8 +392,8 @@
           <a
             v-if="!isFolder"
             class="environment-name"
-            :href="model.environment_path"
-            v-html="model.name">
+            :href="model.environment_path">
+            {{model.name}}
           </a>
           <span v-else v-on:click="toggleRow(model)" class="folder-name">
             <span class="folder-icon">
@@ -401,16 +401,20 @@
               <i v-show="!model.isOpen" class="fa fa-caret-right"></i>
             </span>
 
-            <span v-html="model.name"></span>
+            <span>
+              {{model.name}}
+            </span>
 
-            <span class="badge" v-html="childrenCounter"></span>
+            <span class="badge">
+              {{childrenCounter}}
+            </span>
           </span>
         </td>
 
         <td class="deployment-column">
           <span
-            v-if="shouldRenderDeploymentID"
-            v-html="deploymentInternalId">
+            v-if="shouldRenderDeploymentID">
+            {{deploymentInternalId}}
           </span>
 
           <span v-if="!isFolder && deploymentHasUser">
@@ -427,8 +431,8 @@
         <td>
           <a v-if="shouldRenderBuildName"
             class="build-link"
-            :href="model.last_deployment.deployable.build_path"
-            v-html="buildName">
+            :href="model.last_deployment.deployable.build_path">
+            {{buildName}}
           </a>
         </td>
 
@@ -451,8 +455,8 @@
         <td>
           <span
             v-if="!isFolder && model.last_deployment"
-            class="environment-created-date-timeago"
-            v-html="createdDate">
+            class="environment-created-date-timeago">
+            {{createdDate}}
           </span>
         </td>
 
diff --git a/app/assets/javascripts/vue_common_component/commit.js.es6 b/app/assets/javascripts/vue_common_component/commit.js.es6
index fd628fad4d7..1bc68c1ba2f 100644
--- a/app/assets/javascripts/vue_common_component/commit.js.es6
+++ b/app/assets/javascripts/vue_common_component/commit.js.es6
@@ -138,16 +138,15 @@
 
         <a v-if="hasRef"
           class="monospace branch-name"
-          :href="ref.ref_url"
-          v-html="ref.name">
+          :href="ref.ref_url">
+          {{ref.name}}
         </a>
 
-        <div class="icon-container commit-icon commit-icon-container">
-        </div>
+        <div class="icon-container commit-icon commit-icon-container"></div>
 
         <a class="commit-id monospace"
-          :href="commit_url"
-          v-html="short_sha">
+          :href="commit_url">
+          {{short_sha}}
         </a>
 
         <p class="commit-title">
@@ -156,14 +155,15 @@
               class="avatar-image-container"
               :href="author.web_url">
               <img
-              class="avatar has-tooltip s20"
+                class="avatar has-tooltip s20"
                 :src="author.avatar_url"
                 :alt="userImageAltDescription"
                 :title="author.username" />
             </a>
 
             <a class="commit-row-message"
-              :href="commit_url" v-html="title">
+              :href="commit_url">
+              {{title}}
             </a>
           </span>
           <span v-else>
diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6
index 54c93367b17..3c15e3b7719 100644
--- a/spec/javascripts/environments/environment_item_spec.js.es6
+++ b/spec/javascripts/environments/environment_item_spec.js.es6
@@ -135,7 +135,7 @@ describe('Environment item', () => {
     });
 
     it('should render environment name', () => {
-      expect(component.$el.querySelector('.environment-name').textContent).toEqual(environment.name);
+      expect(component.$el.querySelector('.environment-name').textContent).toContain(environment.name);
     });
 
     describe('With deployment', () => {

From 5960aed32a7998a9c6eb37ffc4a54dfb2b1c8688 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 21 Nov 2016 13:48:48 +0000
Subject: [PATCH 2/3] Fix after review

---
 .../environments/components/environment.js.es6       | 12 ++++--------
 .../components/environment_actions.js.es6            |  3 +--
 .../environments/components/environment_stop.js.es6  |  3 +--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 33d00b7de65..13d5b156f8f 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -157,8 +157,7 @@
             <li v-bind:class="{ 'active': scope === undefined }">
               <a :href="projectEnvironmentsPath">
                 Available
-                <span
-                  class="badge js-available-environments-count">
+                <span class="badge js-available-environments-count">
                   {{state.availableCounter}}
                   </span>
               </a>
@@ -166,8 +165,7 @@
             <li v-bind:class="{ 'active' : scope === 'stopped' }">
               <a :href="projectStoppedEnvironmentsPath">
                 Stopped
-                <span
-                  class="badge js-stopped-environments-count">
+                <span class="badge js-stopped-environments-count">
                   {{state.stoppedCounter}}
                   </span>
               </a>
@@ -185,8 +183,7 @@
             <i class="fa fa-spinner spin"></i>
           </div>
 
-          <div
-            class="blank-state blank-state-no-icon"
+          <div class="blank-state blank-state-no-icon"
             v-if="!isLoading && state.environments.length === 0">
             <h2 class="blank-state-title">
               You don't have any environments right now.
@@ -207,8 +204,7 @@
             </a>
           </div>
 
-          <div
-            class="table-holder"
+          <div class="table-holder"
             v-if="!isLoading && state.environments.length > 0">
             <table class="table ci-table environments">
               <thead>
diff --git a/app/assets/javascripts/environments/components/environment_actions.js.es6 b/app/assets/javascripts/environments/components/environment_actions.js.es6
index 39a2ed54e53..d149a446e0b 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js.es6
+++ b/app/assets/javascripts/environments/components/environment_actions.js.es6
@@ -53,8 +53,7 @@
                 data-method="post"
                 rel="nofollow"
                 class="js-manual-action-link">
-                <span class="action-play-icon-container">
-                </span>
+                <span class="action-play-icon-container"></span>
                 <span>
                   {{action.name}}
                 </span>
diff --git a/app/assets/javascripts/environments/components/environment_stop.js.es6 b/app/assets/javascripts/environments/components/environment_stop.js.es6
index 2c732e50180..e6d66a0148c 100644
--- a/app/assets/javascripts/environments/components/environment_stop.js.es6
+++ b/app/assets/javascripts/environments/components/environment_stop.js.es6
@@ -14,8 +14,7 @@
     },
 
     template: `
-      <a
-        class="btn stop-env-link"
+      <a class="btn stop-env-link"
         :href="stop_url"
         data-confirm="Are you sure you want to stop this environment?"
         data-method="post"

From 89846cac6498c7c0f36f3b8e59d9d481471960e4 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 21 Nov 2016 13:57:27 +0000
Subject: [PATCH 3/3] Fixes identation

---
 .../javascripts/environments/components/environment.js.es6  | 4 ++--
 .../environments/components/environment_item.js.es6         | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 13d5b156f8f..952110744d4 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -159,7 +159,7 @@
                 Available
                 <span class="badge js-available-environments-count">
                   {{state.availableCounter}}
-                  </span>
+                </span>
               </a>
             </li>
             <li v-bind:class="{ 'active' : scope === 'stopped' }">
@@ -167,7 +167,7 @@
                 Stopped
                 <span class="badge js-stopped-environments-count">
                   {{state.stoppedCounter}}
-                  </span>
+                </span>
               </a>
             </li>
           </ul>
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 6bac01632bf..da7db5c05bd 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -389,8 +389,7 @@
     template: `
       <tr>
         <td v-bind:class="{ 'children-row': isChildren}">
-          <a
-            v-if="!isFolder"
+          <a v-if="!isFolder"
             class="environment-name"
             :href="model.environment_path">
             {{model.name}}
@@ -412,8 +411,7 @@
         </td>
 
         <td class="deployment-column">
-          <span
-            v-if="shouldRenderDeploymentID">
+          <span v-if="shouldRenderDeploymentID">
             {{deploymentInternalId}}
           </span>