Commit 83ab63de authored by Phil Hughes's avatar Phil Hughes

fixed conflicts

parent 3f2df9c3
<script> <script>
import actionBtn from './action_btn.vue'; import actionBtn from './action_btn.vue';
<<<<<<< HEAD
import { getTimeago } from '../../lib/utils/datetime_utility'; import { getTimeago } from '../../lib/utils/datetime_utility';
=======
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
>>>>>>> Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
export default { export default {
components: { components: {
actionBtn, actionBtn,
}, },
directives: {
tooltip,
},
props: { props: {
deployKey: { deployKey: {
type: Object, type: Object,
...@@ -24,15 +24,6 @@ ...@@ -24,15 +24,6 @@
required: true, required: true,
}, },
}, },
<<<<<<< HEAD
=======
directives: {
tooltip,
},
components: {
actionBtn,
},
>>>>>>> Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
computed: { computed: {
timeagoDate() { timeagoDate() {
return getTimeago().format(this.deployKey.created_at); return getTimeago().format(this.deployKey.created_at);
...@@ -71,18 +62,12 @@ ...@@ -71,18 +62,12 @@
</div> </div>
<div class="deploy-key-content prepend-left-default deploy-key-projects"> <div class="deploy-key-content prepend-left-default deploy-key-projects">
<a <a
<<<<<<< HEAD v-for="(deployKeysProject, i) in deployKey.deploy_keys_projects"
v-for="(project, i) in deployKey.projects"
class="label deploy-project-label"
:href="project.full_path"
:key="i" :key="i"
=======
v-for="deployKeysProject in deployKey.deploy_keys_projects"
class="label deploy-project-label" class="label deploy-project-label"
:href="deployKeysProject.project.full_path" :href="deployKeysProject.project.full_path"
:title="tooltipTitle(deployKeysProject)" :title="tooltipTitle(deployKeysProject)"
v-tooltip v-tooltip
>>>>>>> Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
> >
{{ deployKeysProject.project.full_name }} {{ deployKeysProject.project.full_name }}
<i <i
......
<script> <script>
<<<<<<< HEAD import sanitize from 'sanitize-html';
import Prompt from '../prompt.vue'; import Prompt from '../prompt.vue';
=======
import sanitize from 'sanitize-html';
import Prompt from '../prompt.vue';
>>>>>>> Merge branch 'fl-ipythin-10-3' into 'security-10-3'
export default { export default {
components: { components: {
prompt: Prompt, prompt: Prompt,
}, },
<<<<<<< HEAD
props: { props: {
rawCode: { rawCode: {
type: String, type: String,
required: true, required: true,
}, },
}, },
};
=======
},
components: {
prompt: Prompt,
},
computed: { computed: {
sanitizedOutput() { sanitizedOutput() {
return sanitize(this.rawCode, { return sanitize(this.rawCode, {
...@@ -35,8 +24,7 @@ import Prompt from '../prompt.vue'; ...@@ -35,8 +24,7 @@ import Prompt from '../prompt.vue';
}); });
}, },
}, },
}; };
>>>>>>> Merge branch 'fl-ipythin-10-3' into 'security-10-3'
</script> </script>
<template> <template>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment