Fix deletion of unprotected branches #2630
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonasfranz
approved these changes
Sep 30, 2017
|
LGTM |
tboerger
added
the
lgtm/need 1
lafriks
requested changes
Oct 1, 2017
|
@lafriks I can change internal api too. At the moment the internal api returns a protectedBranch with canPush: true if there is none. |
|
I think that would be correct approach as this is also what master branch does |
|
@lafriks done |
|
@daviian please fix go fmt error |
Signed-off-by: David Schneiderbauer <[email protected]>
|
LGTM |
tboerger
added
lgtm/done
lafriks
approved these changes
Oct 1, 2017
lafriks
reviewed
Oct 1, 2017
| @@ -38,6 +38,11 @@ func (protectBranch *ProtectedBranch) BeforeUpdate() { | |||
| protectBranch.UpdatedUnix = time.Now().Unix() | |||
| } | |||
|
|
|||
| // IsProtected returns if the branch is protected | |||
| func (protectBranch *ProtectedBranch) IsProtected() bool { | |||
| return protectBranch.ID > 0 | |||
There was a problem hiding this comment.
@daviian you can change here to protectBranch != nil && protectBranch.ID > 0 and than you can remove that nil check above
There was a problem hiding this comment.
@lafriks Current implementation would reflect current master. But if you want, of course I can add the check inside the function.
There was a problem hiding this comment.
@daviian ok, let it be this way than for now, this could be optimized in master than
|
LGTM |
7 tasks
7 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Targets #2629
PR only targets release v1.2 as it is already fixed on master