Skip to content

Commit

Permalink
Merge pull request #1075 from contentstack/merge_fix
Browse files Browse the repository at this point in the history
Merge stage to development
  • Loading branch information
netrajpatel authored Oct 5, 2023
2 parents 5ab2480 + 49dee6f commit eb85da6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion packages/contentstack-import/src/utils/asset-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Bluebird from 'bluebird';
import * as url from 'url';
import * as path from 'path';
import { ContentstackClient, managementSDKClient } from '@contentstack/cli-utilities';
import { ImportConfig } from 'src/types';
import { ImportConfig } from '../types';
const debug = require('debug')('util:requests');
let _ = require('lodash');
let { marked } = require('marked');
Expand Down
6 changes: 3 additions & 3 deletions packages/contentstack-launch/test/unit/mock/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const testFlags = {
noProjOrg: { uid: 'bltad5c549697d10039' },
noProjOrg: { uid: 'bltxxxxxxxxxxxxxx' },
invalidOrg: { name: 'Invalid Org', uid: 'abcd' },
invalidProj: 'abcd',
};
Expand Down Expand Up @@ -29,7 +29,7 @@ export const logsMockData = {
export const githubAdapterMockData = {
userconnection: {
__typename: 'UserConnection',
userUid: 'blt161e02c9fffa78f6',
userUid: 'bltxxxxxxxxxxxxxx',
provider: 'GitHub',
},
adapterConstructorInputs: {
Expand All @@ -43,7 +43,7 @@ export const githubAdapterMockData = {
host: 'api.contentstack.io',
config: '/Users/shrutika.almeida/Downloads/React-Starter/.cs-launch.json',
projectBasePath: '/Users/shrutika.almeida/Downloads/React-Starter',
authtoken: '***REMOVED***',
authtoken: 'bltxxxxxxxxxxxxxx',
authType: 'BASIC',
authorization: undefined,
logsApiBaseUrl: 'https://launch-api.contentstack.com/logs/graphql',
Expand Down

0 comments on commit eb85da6

Please sign in to comment.