flaxo/ghost

Merge pull request #16 from PhantomKnight287/feat/merge-strategiesVerifiedBrowse files at 3764859

Gurpal Singh committed 14 days ago · 32 changed files

Add squash and rebase merges

apps/api/openapi.json

apps/api/src/lib/git/merge/merge.spec.ts

apps/api/src/lib/git/merge/merge.ts

apps/api/src/resources/issues/issues.errors.ts

apps/api/src/resources/issues/issues.service.ts

apps/api/src/resources/pull-requests/dto/pull-request-changes.dto.ts

apps/api/src/resources/pull-requests/dto/pull-request.dto.ts

apps/api/src/resources/pull-requests/pull-requests.controller.ts

apps/api/src/resources/pull-requests/pull-requests.service.ts

apps/api/src/resources/pull-requests/reviews.service.ts

apps/api/src/resources/releases/releases.service.ts

apps/api/test/merge-methods.e2e-spec.ts

apps/api/test/pull-request-reviews.e2e-spec.ts

apps/web/src/app/[username]/[repo]/issues/[number]/layout.tsx

apps/web/src/app/[username]/[repo]/issues/[number]/page.client.tsx

apps/web/src/app/[username]/[repo]/issues/[number]/page.tsx

apps/web/src/app/[username]/[repo]/pulls/[number]/layout.tsx

apps/web/src/app/[username]/[repo]/pulls/[number]/merge-button.tsx

apps/web/src/app/[username]/[repo]/pulls/[number]/page.client.tsx

apps/web/src/app/[username]/[repo]/pulls/[number]/page.tsx

apps/web/src/components/issues/actions.ts

apps/web/src/components/issues/comments.tsx

apps/web/src/components/issues/editable-field.tsx

apps/web/src/components/issues/timeline.tsx

apps/web/src/components/pull-requests/actions.ts

apps/web/src/components/pull-requests/common.ts

apps/web/src/components/pull-requests/review.tsx

apps/web/src/lib/api/v1.d.ts

docs/0026-a-review-is-pinned-to-the-head-it-read.md

docs/0027-squash-and-rebase-carry-the-head-along.md

docs/README.md

docs/roadmap.md