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

Improve LDAP group config documentation, fixes #21159 #21227

Merged
merged 1 commit into from Sep 5, 2023

Conversation

svenseeberg
Copy link
Contributor

Improve the wording of the LDAP group attributes documentation and expand the examples.

@denyskon denyskon added type/docs This PR mainly updates/creates documentation lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Aug 2, 2023
@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 Aug 4, 2023
@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 Sep 4, 2023
@techknowlogick
Copy link
Member

Thanks for this PR @svenseeberg, are you able to rebase this PR? Since the contribution is coming from a GitHub org we are unable to push to this branch ourselves to be able to merge this.
If you aren't able to, and that's totally okay, if you could let us know then we can cherry-pick the commit to a new PR (with your author information still intact of course).

@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 5, 2023
@svenseeberg
Copy link
Contributor Author

svenseeberg commented Sep 5, 2023

@techknowlogick I rebased the commit on the current main branch.

@techknowlogick techknowlogick merged commit 5f7fa27 into go-gitea:main Sep 5, 2023
24 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Sep 5, 2023
@techknowlogick
Copy link
Member

Thanks so much @svenseeberg :)

@techknowlogick techknowlogick added the backport/v1.20 This PR should be backported to Gitea 1.20 label Sep 5, 2023
@GiteaBot
Copy link
Contributor

GiteaBot commented Sep 5, 2023

I was unable to create a backport for 1.20. @svenseeberg, please send one manually. 🍵

go run ./contrib/backport 21227
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Sep 5, 2023
@techknowlogick
Copy link
Member

@svenseeberg don't worry about @GiteaBot's message. I'm going to create the backport manually.

techknowlogick added a commit that referenced this pull request Sep 6, 2023
backport #21227

author @svenseeberg

Co-authored-by: Sven Seeberg <mail@sven-seeberg.de>
Co-authored-by: Giteabot <teabot@gitea.io>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 6, 2023
* giteaofficial/main:
  Add missing translation (go-gitea#26926)
  Vendor `jquery.are-you-sure` with strict mode fixes (go-gitea#26901)
  Fix the secret regexp pattern on web page (go-gitea#26910)
  Add @chenrui333 as maintainer (go-gitea#26917)
  Move notification interface to services layer (go-gitea#26915)
  fetch emails of currently displayed user on admin page (go-gitea#26918)
  Improve LDAP group config documentation, fixes go-gitea#21159 (go-gitea#21227)
  update footer link to new landing page (go-gitea#26916)
  Remove `Named` interface (go-gitea#26913)
  Refactor secrets modification logic (go-gitea#26873)
  Add missing `reqToken()` to notifications endpoints (go-gitea#26914)
  feat(API): add routes and functions for managing user's secrets (go-gitea#26909)
  Move feed notification service layer (go-gitea#26908)
  Extract common code to new template (go-gitea#26903)
  Move ui notification to service layer (go-gitea#26907)
  Remove duplicated notify mail configuration on tests (go-gitea#26912)
  Move indexer notification to service layer (go-gitea#26906)

# Conflicts:
#	templates/base/footer_content.tmpl
@techknowlogick techknowlogick modified the milestones: 1.22.0, 1.21.0 Sep 6, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/docs This PR mainly updates/creates documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants