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.

Sign up for GitHub

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

Jump to bottom

Avatar autogeneration fixed #13282

Merged
merged 3 commits into from
Oct 26, 2020
Merged

Avatar autogeneration fixed #13282

merged 3 commits into from
Oct 26, 2020

Conversation

pboguslawski
Copy link
Contributor

This mod fixes problem with initial avatar autogeneration and
avatar autogneration after deleting previous avatar.

Related: #13159
Related: #13233
Fixes: 80a6b0f
Author-Change-Id: IB#1105243

@pboguslawski
Avatar autogeneration fixed
0e2d6e6 
This mod fixes problem with initial avatar autogeneration and
avatar autogneration after deleting previous avatar.

Related: go-gitea#13159
Fixes: 80a6b0f
Author-Change-Id: IB#1105243
@pboguslawski
Copy link
Contributor Author

This PR is backport of

#13233 (comment)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 23, 2020
@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 Oct 23, 2020
@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 Oct 23, 2020
@lafriks
Copy link
Member

lafriks commented Oct 23, 2020

Please rebase with release branch

@lafriks lafriks added this to the 1.13.0 milestone Oct 23, 2020
@pboguslawski
Copy link
Contributor Author

According to The Golden Rule of Rebasing we do not rebase public branches. Just merged current release/v1.13 to this PR.

@lafriks
Copy link
Member

lafriks commented Oct 26, 2020

please merge again or set option to allow contributors to change PR branch as it needs up to date with base branch to be mergable

@pboguslawski
Copy link
Contributor Author

please merge again

Just merged current release/v1.13 to this PR.

or set option to allow contributors to change PR branch as it needs up to date with base branch to be mergable

I don't see option described on

https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork

in this PR. Please drop me hint if you'll need access to this PR.

@lafriks lafriks merged commit 28133a8 into go-gitea:release/v1.13 Oct 26, 2020
@lafriks
Copy link
Member

lafriks commented Oct 26, 2020

There should be checkbox when creating new PR, I have no idea how to change it later on ;)

@pboguslawski pboguslawski deleted the release/v1.13-IB#1105243 branch October 30, 2020 21:38
@go-gitea go-gitea locked and limited conversation to collaborators Dec 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 approved these changes

@zeripath zeripath zeripath approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.13.0
Development

Successfully merging this pull request may close these issues.
5 participants
@pboguslawski @lafriks @zeripath @6543 @GiteaBot