diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-11-21 11:45:22 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-11-21 11:45:22 +0000 |
| commit | 903c81327f3e443a84ba24cfc68be635a3904722 (patch) | |
| tree | 09628f7bede7533e90ca7a5a7ff266634922cd7c /app/assets/javascripts/environments | |
| parent | b98193c55edc94b3ecf1ff143ac85fa9e9d8f029 (diff) | |
| download | gitlab-ce-903c81327f3e443a84ba24cfc68be635a3904722.tar.gz | |
Remove v-html
Diffstat (limited to 'app/assets/javascripts/environments')
3 files changed, 24 insertions, 17 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> |