Skip to content
New issue

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

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

Already on GitHub? # to your account

fix: Do not attempt to merge a pull request if the status is blocked #400

Merged
merged 3 commits into from
Oct 8, 2020

Conversation

sambhav
Copy link
Contributor

@sambhav sambhav commented Oct 6, 2020

I split out the fix for #389 from #394
This has the required test and doc fixes for #389

@jusx @shine2lay please review and merge this before #394

@codecov-io
Copy link

codecov-io commented Oct 6, 2020

Codecov Report

Merging #400 into master will decrease coverage by 0.35%.
The diff coverage is 88.53%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #400      +/-   ##
==========================================
- Coverage   94.16%   93.81%   -0.36%     
==========================================
  Files          72       73       +1     
  Lines        1578     1665      +87     
  Branches      301      326      +25     
==========================================
+ Hits         1486     1562      +76     
- Misses         81       90       +9     
- Partials       11       13       +2     
Impacted Files Coverage Δ
lib/actions/checks.js 93.61% <ø> (ø)
lib/validators/assignee.js 100.00% <ø> (ø)
lib/validators/commit.js 100.00% <ø> (ø)
lib/validators/description.js 100.00% <ø> (ø)
lib/validators/label.js 100.00% <ø> (ø)
lib/validators/milestone.js 100.00% <ø> (ø)
lib/validators/project.js 97.91% <ø> (ø)
lib/validators/title.js 100.00% <ø> (ø)
lib/actions/merge.js 80.00% <66.66%> (-0.77%) ⬇️
lib/validators/approvals.js 93.68% <75.00%> (-3.20%) ⬇️
... and 14 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d3a68f7...2245dcd. Read the comment docs.

@sambhav
Copy link
Contributor Author

sambhav commented Oct 7, 2020

@jusx @shine2lay can you also take a look at this - it is an important fix. Currently mergeable also merges closed PRs if all the checks pass.

Copy link
Member

@jusx jusx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jusx
Copy link
Member

jusx commented Oct 8, 2020

@samj1912 Could you please resolve the conflict?

@mergeable mergeable bot merged commit 69ce004 into mergeability:master Oct 8, 2020
@sambhav sambhav deleted the merge-status-fix branch October 8, 2020 00:15
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants