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

Do not try to recreate ldap user if they are already created #9900

Merged
merged 5 commits into from
Jan 21, 2020
Merged

Do not try to recreate ldap user if they are already created #9900

merged 5 commits into from
Jan 21, 2020

Conversation

zeripath
Copy link
Contributor

FIx #9897

@zeripath zeripath added this to the 1.12.0 milestone Jan 20, 2020
@codecov-io
Copy link

codecov-io commented Jan 20, 2020 •
edited

Codecov Report

❗ No coverage uploaded for pull request base (master@6b4791c). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##             master   #9900   +/-   ##
========================================
  Coverage          ?   42.3%           
========================================
  Files             ?     607           
  Lines             ?   79357           
  Branches          ?       0           
========================================
  Hits              ?   33570           
  Misses            ?   41646           
  Partials          ?    4141

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6b4791c...fcd9994. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 20, 2020
@lafriks
Copy link
Member

lafriks commented Jan 20, 2020

ExternalUserLogin also does need to remove autocreate param then

@zeripath
Copy link
Contributor Author

zeripath commented Jan 20, 2020 •
edited

I agree - but I'm intending this to be backported and don't want to completely restructure all of this code.

Ah screw it. It's a small change anyway. 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 Jan 20, 2020
@zeripath
Copy link
Contributor Author

I've just done the slight refactor that removes the autoregister bit.

@iamdoubz iamdoubz mentioned this pull request Jan 21, 2020
Closed
7 tasks
@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 Jan 21, 2020
@zeripath zeripath merged commit a315e09 into go-gitea:master Jan 21, 2020
@zeripath zeripath deleted the fix-9897 branch January 21, 2020 18:49
zeripath added a commit to zeripath/gitea that referenced this pull request Jan 21, 2020
@zeripath @techknowlogick
Do not try to recreate ldap user if they are already created (go-gite…
0155fb6 
…a#9900)

* Do not try to recreate ldap user if they are already created

* just remove autoregister

Co-authored-by: techknowlogick <[email protected]>
sapk pushed a commit that referenced this pull request Jan 21, 2020
@zeripath @techknowlogick @sapk
Do not try to recreate ldap user if they are already created (#9900) (#…
79c1d48 
…9919)

* Do not try to recreate ldap user if they are already created

* just remove autoregister

Co-authored-by: techknowlogick <[email protected]>

Co-authored-by: techknowlogick <[email protected]>
@zeripath zeripath mentioned this pull request Jan 22, 2020
Merged
@zeripath zeripath added the backport/done All backports for this PR have been created label Jan 22, 2020
@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.
Reviewers

@lafriks lafriks lafriks approved these changes

@guillep2k guillep2k guillep2k 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. type/bug
Projects
None yet
Milestone
1.12.0
Development

Successfully merging this pull request may close these issues.

LDAP BindDN Multiple Log In Options Results in user already exists error
6 participants
@zeripath @codecov-io @lafriks @guillep2k @GiteaBot @techknowlogick