Merge branch 'main' into feat/api-keys

pull/2277/head
kodiakhq[bot] 2022-04-15 17:31:57 +00:00 committed by GitHub
commit c99a99ba2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -38,7 +38,7 @@ export default function APIDocs() {
docExpansion="none" docExpansion="none"
operationsSorter="method" operationsSorter="method"
filter={true} filter={true}
url={process.env.NEXT_PUBLIC_SWAGGER_DOCS_URL || "https://api.cal.dev/docs"} url={process.env.NEXT_PUBLIC_SWAGGER_DOCS_URL || "https://api.cal.com/api/docs"}
/> />
</div> </div>
); );

View File

@ -40,13 +40,14 @@ const defaultLocations: OptionTypeBase[] = [
]; ];
export function getLocationOptions(integrations: AppMeta, t: TFunction) { export function getLocationOptions(integrations: AppMeta, t: TFunction) {
const locations = [...defaultLocations];
integrations.forEach((app) => { integrations.forEach((app) => {
if (app.locationOption) { if (app.locationOption) {
defaultLocations.push(app.locationOption); locations.push(app.locationOption);
} }
}); });
return translateLocations(defaultLocations, t); return translateLocations(locations, t);
} }
/** /**