diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-18 10:35:49 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-18 10:35:49 +0100 |
| commit | 58b4ad40ae0fd79d2582d161c82181ddf9fa2bff (patch) | |
| tree | a435fab898774c46e54eda706426d60acef4818a | |
| parent | a0becdab160bf03c48f14dbc0511824000c09fa7 (diff) | |
| download | gitlab-ce-58b4ad40ae0fd79d2582d161c82181ddf9fa2bff.tar.gz | |
Fix conflicts for app/assets/javascripts/pipelines/components/graph/action_component.vue
| -rw-r--r-- | app/assets/javascripts/pipelines/components/graph/action_component.vue | 4 |
1 files changed, 0 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 2f888ba5ee3..3fc6a74b268 100644 --- a/app/assets/javascripts/pipelines/components/graph/action_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue @@ -91,12 +91,8 @@ export default { btn-transparent ci-action-icon-container ci-action-icon-wrapper" :class="cssClass" data-container="body" -<<<<<<< HEAD :disabled="isDisabled" -======= data-boundary="viewport" - @click="onClickAction" ->>>>>>> e3e4a7f3af... Merge branch 'remove-pointer-events' into 'master' > <icon :name="actionIcon"/> </button> |