Skip to content

LDAP: ignore already existing public keys after ldap sync #6766

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

Merged
merged 5 commits into from
Apr 26, 2019
Merged

LDAP: ignore already existing public keys after ldap sync #6766

merged 5 commits into from
Apr 26, 2019

Conversation

zyclonite
Copy link
Contributor

@zyclonite zyclonite commented Apr 26, 2019

Log at Trace level only on ErrKeyAlreadyExist - instead of at Error level.
Fix typo in ErrKeyAlreadyExist Error string.

…y import if existing

Signed-off-by: Lukas Prettenthaler <lukas@noenv.com>
Signed-off-by: Lukas Prettenthaler <lukas@noenv.com>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 26, 2019
@lafriks lafriks added type/enhancement An improvement of existing functionality type/bug and removed type/enhancement An improvement of existing functionality labels Apr 26, 2019
@lafriks lafriks added this to the 1.9.0 milestone Apr 26, 2019
Signed-off-by: Lukas Prettenthaler <lukas@noenv.com>
Signed-off-by: Lukas Prettenthaler <lukas@noenv.com>
@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 Apr 26, 2019
@codecov-io
Copy link

codecov-io commented Apr 26, 2019

Codecov Report

Merging #6766 into master will increase coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6766      +/-   ##
==========================================
+ Coverage   40.99%   40.99%   +<.01%     
==========================================
  Files         421      421              
  Lines       58050    58054       +4     
==========================================
+ Hits        23797    23802       +5     
+ Misses      31086    31085       -1     
  Partials     3167     3167
Impacted Files Coverage Δ
models/user.go 51.06% <0%> (-0.1%) ⬇️
models/error.go 32.08% <0%> (ø) ⬆️
models/repo_list.go 67.89% <0%> (+1.05%) ⬆️
models/unit.go 48.64% <0%> (+5.4%) ⬆️

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 f6eedd4...4f5d8ce. Read the comment docs.

@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 Apr 26, 2019
@lafriks lafriks merged commit 81059a2 into go-gitea:master Apr 26, 2019
@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.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants