diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-10-22 23:06:05 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-10-22 23:06:05 +0300 |
| commit | 53be95daf41fc4e59deab149485210835e7e54cd (patch) | |
| tree | 3f377dcc6289049581e2473b7e12f260e774784f /app/assets/javascripts/environments/components/environment_actions.vue | |
| parent | 3fb7a1f97a812b7b2b5e80a8a0575cb7bfd2d3c4 (diff) | |
| parent | d6be7ed79557ce31a5d0062ceea00c877157a6c7 (diff) | |
Merge branch 'master' into scheduled-manual-jobs-environment-play-buttons
Conflicts:
spec/javascripts/environments/environment_actions_spec.js
Diffstat (limited to 'app/assets/javascripts/environments/components/environment_actions.vue')
| -rw-r--r-- | app/assets/javascripts/environments/components/environment_actions.vue | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/environments/components/environment_actions.vue b/app/assets/javascripts/environments/components/environment_actions.vue index 7ee2bb61007..2d51a13d8a0 100644 --- a/app/assets/javascripts/environments/components/environment_actions.vue +++ b/app/assets/javascripts/environments/components/environment_actions.vue @@ -81,11 +81,9 @@ export default { > <span> <icon name="play" /> - <i - class="fa fa-caret-down" - aria-hidden="true" - > - </i> + <icon + name="chevron-down" + /> <gl-loading-icon v-if="isLoading" /> </span> </button> |