Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/rebase #99

Merged
merged 9 commits into from
Sep 23, 2020
Merged

Feature/rebase #99

merged 9 commits into from
Sep 23, 2020

Conversation

Pilopa
Copy link
Contributor

@Pilopa Pilopa commented Sep 16, 2020

Proposed changes

Add support for pr merge with prior rebase.

Your checklist for this pull request

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • PR is well described
  • Related issues linked to PR if existing and labels set
  • Target branch is not master (in most cases develop should bet the target of choice)
  • Code does not conflict with target branch
  • New code is covered with unit tests
  • CHANGELOG.md updated
  • Definition of Done's fulfilled: DoD // UI DoD
  • Documentation updated (only necessary for new features or changed behaviour)

Checklist for branch merge request (not required for forks)

@Pilopa Pilopa added dependencies Pull requests that update a dependency file enhancement New feature or request labels Sep 16, 2020
src/main/js/MergeButton.tsx Outdated Show resolved Hide resolved
src/main/js/MergeButton.tsx Outdated Show resolved Hide resolved
src/main/js/MergeForm.tsx Outdated Show resolved Hide resolved
src/main/js/MergeModal.tsx Outdated Show resolved Hide resolved
src/main/js/MergeModal.tsx Outdated Show resolved Hide resolved
src/main/js/PullRequestDetails.tsx Outdated Show resolved Hide resolved
src/main/js/pullRequest.ts Outdated Show resolved Hide resolved
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 3 Code Smells

67.9% 67.9% Coverage
0.0% 0.0% Duplication

@pfeuffer pfeuffer merged commit c7a1ffe into develop Sep 23, 2020
@pfeuffer pfeuffer deleted the feature/rebase branch September 23, 2020 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants