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

Actually fix #471 and #931 #939

Merged
merged 1 commit into from
Feb 1, 2023
Merged

Conversation

timrabl
Copy link
Contributor

@timrabl timrabl commented Jan 31, 2023

Related Issue:

New Behavior

Same as in #931

Contrast to Current Behavior

Same as in #931, but reverts AUTH_LDAP_USER_SEARCH that was accidentally removed...

Discussion: Benefits and Drawbacks

Changes to the Wiki

Same as in #931

Proposed Release Note Entry

Same as in #931

Double Check

  • I have read the comments and followed the PR template.
  • I have explained my PR according to the information in the comments.
  • My PR targets the develop branch.

@tobiasge
Copy link
Member

This part must have been lost in the formatting commit because it was there when I tested the configuration.

I think your branch is not up to date with develop. The commit tab show 5 commits to be merged when only one should be there.
Could you rebase your branch onto the current develop branch? Or you could squash those into one commit.

@timrabl timrabl force-pushed the fix-931 branch 2 times, most recently from 0a12526 to 58799f8 Compare February 1, 2023 06:52
@timrabl timrabl marked this pull request as draft February 1, 2023 07:11
add missing AUTH_LDAP_USER_SEARCH, removed while modifying....

revert AUTH_LDAP_USER_SEARCH variable that was accidentally removed in netbox-community#931 and change behaviour to requested features in netbox-community#471

remove duplicate AUTH_LDAP_USER_SEARCH variable now and fix this finally, hopefully
@timrabl timrabl marked this pull request as ready for review February 1, 2023 07:19
@tobiasge tobiasge enabled auto-merge February 1, 2023 08:30
@tobiasge tobiasge merged commit 879c700 into netbox-community:develop Feb 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants