diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-13 12:07:08 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-13 12:07:08 +0000 |
commit | 6c74b0a334f42b82eeb1b3b14bd3eeb75b0af6c0 (patch) | |
tree | 64af505c1e378c01ac98ddaff54b1ffa1f45cac7 /app/assets/javascripts/pipelines/components/graph/action_component.vue | |
parent | b66204e6e587f8bea51af813ef344ef75c1796c1 (diff) | |
parent | 83397ed0713d7d1c950f973b28ed4df7c8cc7185 (diff) | |
download | gitlab-ce-6c74b0a334f42b82eeb1b3b14bd3eeb75b0af6c0.tar.gz |
Merge branch 'fl-eslint-vue-house-keeping' into 'master'
Updates eslint vue plugin version
See merge request gitlab-org/gitlab-ce!19648
Diffstat (limited to 'app/assets/javascripts/pipelines/components/graph/action_component.vue')
-rw-r--r-- | app/assets/javascripts/pipelines/components/graph/action_component.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/action_component.vue b/app/assets/javascripts/pipelines/components/graph/action_component.vue index 82b4ce083fb..db0505a55fe 100644 --- a/app/assets/javascripts/pipelines/components/graph/action_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue @@ -83,15 +83,15 @@ export default { </script> <template> <button - type="button" - @click="onClickAction" v-tooltip :title="tooltipText" + :class="cssClass" + :disabled="isDisabled" + type="button" class="js-ci-action btn btn-blank btn-transparent ci-action-icon-container ci-action-icon-wrapper" - :class="cssClass" data-container="body" - :disabled="isDisabled" + @click="onClickAction" > <icon :name="actionIcon"/> </button> |