fix: rebase open authoring branches (#2975)

* fix: create open authoring branches from default origin branch

* refactor: pass repoURL to getBranch

* fix(backend-github): rebase open authoring branch,support multiple files
This commit is contained in:
Erez Rokah
2019-12-20 19:33:43 +02:00
committed by Shawn Erquhart
parent e2d778754d
commit 8c175f6132
66 changed files with 14232 additions and 15037 deletions

View File

@ -397,7 +397,6 @@ export function persistUnpublishedEntry(collection: Collection, existingUnpublis
collection,
entryDraft: serializedEntryDraft,
assetProxies,
integrations: state.integrations,
usedSlugs,
});
dispatch(
@ -561,7 +560,6 @@ export function unpublishPublishedEntry(collection: Collection, slug: string) {
collection,
entryDraft,
assetProxies: [],
integrations: state.integrations,
usedSlugs: List(),
status: status.get('PENDING_PUBLISH'),
}),

View File

@ -601,7 +601,6 @@ export function persistEntry(collection: Collection) {
collection,
entryDraft: serializedEntryDraft,
assetProxies,
integrations: state.integrations,
usedSlugs,
})
.then((slug: string) => {

View File

@ -42,7 +42,6 @@ import {
FilterRule,
Collections,
MediaFile,
Integrations,
EntryDraft,
CollectionFile,
State,
@ -208,7 +207,6 @@ interface Implementation {
collectionName: string;
useWorkflow: boolean;
unpublished: boolean;
hasAssetStore: boolean;
status?: string;
},
) => Promise<void>;
@ -267,7 +265,6 @@ interface PersistArgs {
collection: Collection;
entryDraft: EntryDraft;
assetProxies: AssetProxy[];
integrations: Integrations;
usedSlugs: List<string>;
unpublished?: boolean;
status?: string;
@ -774,7 +771,6 @@ export class Backend {
collection,
entryDraft,
assetProxies,
integrations,
usedSlugs,
unpublished = false,
status,
@ -844,11 +840,7 @@ export class Backend {
const collectionName = collection.get('name');
/**
* Determine whether an asset store integration is in use.
*/
const hasAssetStore = integrations && !!selectIntegration(integrations, null, 'assetStore');
const updatedOptions = { unpublished, hasAssetStore, status };
const updatedOptions = { unpublished, status };
const opts = {
newEntry,
parsedData,