Skip to content

fix: allow ISE to initiate conflict review#5570

Merged
rjsparks merged 3 commits intoietf-tools:mainfrom
elear:fix_5261
May 3, 2023
Merged

fix: allow ISE to initiate conflict review#5570
rjsparks merged 3 commits intoietf-tools:mainfrom
elear:fix_5261

Conversation

@elear
Copy link
Copy Markdown
Contributor

@elear elear commented May 3, 2023

This very small change should address #5261 . Very small change to a list.

Add ISE to list of those roles who can initiate a conflict review.
@elear
Copy link
Copy Markdown
Contributor Author

elear commented May 3, 2023

For numerous reasons I have NOT tested this code, directly (I haven't yet replicated the environment, and the fork of this code is MASSIVE from a remote location. (So if someone could get this up on a sandbox, I would be happy to test).

@rjsparks
Copy link
Copy Markdown
Member

rjsparks commented May 3, 2023

See the readme on how to make a local clone that is smaller than the whole thing.

@rjsparks
Copy link
Copy Markdown
Member

rjsparks commented May 3, 2023

Thanks for this. The PR has one part of the essential fix, but there are a couple of other places that need to be touched and this needs to have tests added to the test suite. I'll work these in.

@rjsparks
Copy link
Copy Markdown
Member

rjsparks commented May 3, 2023

@elear: I pushed a commit that changes the conditional and adds tests.

@rjsparks rjsparks requested a review from jennifer-richards May 3, 2023 18:01
@rjsparks rjsparks changed the title ISE may initiate conflict review fix: allow ISE to initiate conflict review May 3, 2023
@codecov
Copy link
Copy Markdown

codecov Bot commented May 3, 2023

Codecov Report

Merging #5570 (c9661cf) into main (0bf9462) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #5570   +/-   ##
=======================================
  Coverage   88.80%   88.80%           
=======================================
  Files         285      285           
  Lines       39756    39757    +1     
=======================================
+ Hits        35304    35308    +4     
+ Misses       4452     4449    -3     
Impacted Files Coverage Δ
ietf/doc/views_doc.py 91.64% <100.00%> (+0.10%) ⬆️

... and 3 files with indirect coverage changes

@rjsparks rjsparks merged commit 8af8a91 into ietf-tools:main May 3, 2023
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators May 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants