awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 16:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Tuan Dang
2023-07-19 23:29:01 +07:00
parent c5438fbe6d
commit eda095b55f
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/variables/integration.ts
+12 -19
View File
@@ -22,11 +22,11 @@ export const INTEGRATION_FLYIO = "flyio";
export const INTEGRATION_LARAVELFORGE = "laravel-forge" export const INTEGRATION_LARAVELFORGE = "laravel-forge"
export const INTEGRATION_CIRCLECI = "circleci"; export const INTEGRATION_CIRCLECI = "circleci";
export const INTEGRATION_TRAVISCI = "travisci"; export const INTEGRATION_TRAVISCI = "travisci";
export const INTEGRATION_SUPABASE = 'supabase'; export const INTEGRATION_SUPABASE = "supabase";
export const INTEGRATION_CHECKLY = 'checkly'; export const INTEGRATION_CHECKLY = "checkly";
export const INTEGRATION_HASHICORP_VAULT = 'hashicorp-vault'; export const INTEGRATION_HASHICORP_VAULT = "hashicorp-vault";
export const INTEGRATION_CLOUDFLARE_PAGES = 'cloudflare-pages'; export const INTEGRATION_CLOUDFLARE_PAGES = "cloudflare-pages";
export const INTEGRATION_CODEFRESH = 'codefresh'; export const INTEGRATION_CODEFRESH = "codefresh";
export const INTEGRATION_SET = new Set([ export const INTEGRATION_SET = new Set([
INTEGRATION_AZURE_KEY_VAULT, INTEGRATION_AZURE_KEY_VAULT,
INTEGRATION_HEROKU, INTEGRATION_HEROKU,
@@ -69,11 +69,11 @@ export const INTEGRATION_RAILWAY_API_URL = "https://backboard.railway.app/graphq
export const INTEGRATION_FLYIO_API_URL = "https://api.fly.io/graphql"; export const INTEGRATION_FLYIO_API_URL = "https://api.fly.io/graphql";
export const INTEGRATION_CIRCLECI_API_URL = "https://circleci.com/api"; export const INTEGRATION_CIRCLECI_API_URL = "https://circleci.com/api";
export const INTEGRATION_TRAVISCI_API_URL = "https://api.travis-ci.com"; export const INTEGRATION_TRAVISCI_API_URL = "https://api.travis-ci.com";
export const INTEGRATION_SUPABASE_API_URL = 'https://api.supabase.com'; export const INTEGRATION_SUPABASE_API_URL = "https://api.supabase.com";
export const INTEGRATION_LARAVELFORGE_API_URL = "https://forge.laravel.com"; export const INTEGRATION_LARAVELFORGE_API_URL = "https://forge.laravel.com";
export const INTEGRATION_CHECKLY_API_URL = 'https://api.checklyhq.com'; export const INTEGRATION_CHECKLY_API_URL = "https://api.checklyhq.com";
export const INTEGRATION_CLOUDFLARE_PAGES_API_URL = 'https://api.cloudflare.com'; export const INTEGRATION_CLOUDFLARE_PAGES_API_URL = "https://api.cloudflare.com";
export const INTEGRATION_CODEFRESH_API_URL = 'https://g.codefresh.io/api'; export const INTEGRATION_CODEFRESH_API_URL = "https://g.codefresh.io/api";
export const getIntegrationOptions = async () => { export const getIntegrationOptions = async () => {
const INTEGRATION_OPTIONS = [ const INTEGRATION_OPTIONS = [
@@ -245,10 +245,9 @@ export const getIntegrationOptions = async () => {
slug: "cloudflare-pages", slug: "cloudflare-pages",
image: "Cloudflare.png", image: "Cloudflare.png",
isAvailable: true, isAvailable: true,
<<<<<<< HEAD type: "pat",
type: 'pat', clientId: "",
clientId: '', docsLink: ""
docsLink: ''
}, },
{ {
name: "Codefresh", name: "Codefresh",
@@ -259,12 +258,6 @@ export const getIntegrationOptions = async () => {
clientId: "", clientId: "",
docsLink: "", docsLink: "",
}, },
=======
type: "pat",
clientId: "",
docsLink: ""
}
>>>>>>> origin
] ]
return INTEGRATION_OPTIONS; return INTEGRATION_OPTIONS;