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

Handle ErrUserProhibitLogin in http git (#7586, #7591) #7590

Merged
merged 3 commits into from
Jul 23, 2019

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Jul 23, 2019

Backport #7586 & #7591

Fix #7558

@zeripath zeripath added this to the 1.9.0 milestone Jul 23, 2019
@sapk
Copy link
Member

sapk commented Jul 23, 2019

After reviewing #7586 (comment). I think we should send and 403 and not a 401 response in this case.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 23, 2019
@zeripath
Copy link
Contributor Author

I think that would mean that the backport and master were not aligned unless we added another PR to apply that.

@sapk
Copy link
Member

sapk commented Jul 23, 2019

The best would be to not merged this backport and do a new PR on master that will be backported. I can do it if you don't have time.

@lafriks
Copy link
Member

lafriks commented Jul 23, 2019

I agree with @sapk that master should be fixed first

@zeripath
Copy link
Contributor Author

zeripath commented Jul 23, 2019

Now includes backport of #7591

@zeripath zeripath changed the title Handle ErrUserProhibitLogin in http git (#7586) Handle ErrUserProhibitLogin in http git (#7586, #7591) Jul 23, 2019
@zeripath
Copy link
Contributor Author

Ok @sapk and @lafriks that's done.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 23, 2019
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 23, 2019
@techknowlogick techknowlogick merged commit 5a3d986 into go-gitea:release/v1.9 Jul 23, 2019
@zeripath zeripath deleted the backport-7586 branch July 23, 2019 21:25
@sapk
Copy link
Member

sapk commented Jul 23, 2019

Thanks @zeripath for your reactivity.

@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants