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

Fix lfs management setting #18946

Merged
merged 2 commits into from Mar 1, 2022
Merged

Fix lfs management setting #18946

merged 2 commits into from Mar 1, 2022

Conversation

lunny
Copy link
Member

@lunny lunny commented Mar 1, 2022

Fix #18782

@lunny lunny added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.16 labels Mar 1, 2022
@lunny lunny mentioned this pull request Mar 1, 2022
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Mar 1, 2022
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 1, 2022
@techknowlogick techknowlogick added this to the 1.17.0 milestone Mar 1, 2022
@6543 6543 requested a review from Gusted March 1, 2022 19:21
@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 Mar 1, 2022
@zeripath zeripath merged commit 38f6322 into go-gitea:main Mar 1, 2022
@zeripath
Copy link
Contributor

zeripath commented Mar 1, 2022

Please send backport

@6543
Copy link
Member

6543 commented Mar 1, 2022

was merged first 😆

@lunny lunny deleted the lunny/fix_lfs_lock_setting branch March 2, 2022 00:25
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 2, 2022
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
9a7a780 
* giteaofficial/main:
  Send 404 on `/{org}.gpg` (go-gitea#18959)
  Accounts with WebAuthn only (no TOTP) now exist ... fix code to handle that case (go-gitea#18897)
  Fix lfs management setting (go-gitea#18946)
  Fix admin user list pagination (go-gitea#18957)
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
@lunny
Fix lfs management setting (go-gitea#18946)
d0d0473 
Fix go-gitea#18782
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 approved these changes

@Gusted Gusted Gusted approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Milestone
1.17.0
Development

Successfully merging this pull request may close these issues.

Internal Server Error when listing locks or accessing locked files in web view
6 participants
@lunny @zeripath @6543 @Gusted @techknowlogick @GiteaBot