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

Use session for retrieving org teams #11438

Merged
merged 2 commits into from May 16, 2020
Merged

Use session for retrieving org teams #11438

merged 2 commits into from May 16, 2020

Conversation

guillep2k
Copy link
Member

@guillep2k guillep2k commented May 16, 2020 •
edited by zeripath

Prevent deadlock

Fix #10549
Fix #11628

@guillep2k guillep2k added this to the 1.12.0 milestone May 16, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label May 16, 2020
@zeripath
Copy link
Contributor

FINALLY!

@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 May 16, 2020
6543
6543 approved these changes May 16, 2020
View reviewed changes
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@codecov-io
Copy link

Codecov Report

Merging #11438 into master will increase coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #11438   +/-   ##
=======================================
  Coverage   43.95%   43.96%           
=======================================
  Files         614      614           
  Lines       87457    87457           
=======================================
+ Hits        38446    38447    +1     
- Misses      44275    44277    +2     
+ Partials     4736     4733    -3
Impacted Files Coverage Δ
models/repo.go 52.21% <0.00%> (ø)
models/unit.go 41.97% <0.00%> (-2.47%) ⬇️
routers/repo/view.go 35.96% <0.00%> (-0.68%) ⬇️
modules/notification/webhook/webhook.go 43.00% <0.00%> (-0.59%) ⬇️
models/issue.go 51.94% <0.00%> (-0.47%) ⬇️
modules/git/repo.go 51.88% <0.00%> (+0.83%) ⬆️
modules/process/manager.go 78.31% <0.00%> (+3.61%) ⬆️
modules/git/utils.go 75.00% <0.00%> (+3.94%) ⬆️
modules/indexer/stats/db.go 59.37% <0.00%> (+18.75%) ⬆️
modules/indexer/stats/queue.go 81.25% <0.00%> (+18.75%) ⬆️

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 4744e1e...597f180. Read the comment docs.

@zeripath zeripath merged commit c3d9a5f into go-gitea:master May 16, 2020
@zeripath
Copy link
Contributor

Please

@zeripath
Copy link
Contributor

Send

@zeripath
Copy link
Contributor

Backport

guillep2k added a commit to guillep2k/gitea that referenced this pull request May 16, 2020
@guillep2k
Use session for retrieving org teams (go-gitea#11438)
18760ca 
Co-authored-by: Guillermo Prandi <guillep2k@users.noreply.github.com>
@guillep2k guillep2k mentioned this pull request May 16, 2020
Merged
@guillep2k guillep2k added the backport/done All backports for this PR have been created label May 16, 2020
lafriks pushed a commit that referenced this pull request May 16, 2020
@guillep2k
Use session for retrieving org teams (#11438) (#11439)
8784341 
Co-authored-by: Guillermo Prandi <guillep2k@users.noreply.github.com>
@lafriks
Copy link
Member

lafriks commented May 16, 2020

Should fix #10549

@guillep2k guillep2k deleted the fix-transfer branch May 16, 2020 21:14
@bdrpc
Copy link

bdrpc commented May 19, 2020

Well done!
:）

@zeripath zeripath mentioned this pull request May 26, 2020
Closed
7 tasks
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
@guillep2k
Use session for retrieving org teams (go-gitea#11438)
5ad4cc5 
Co-authored-by: Guillermo Prandi <guillep2k@users.noreply.github.com>
@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

@techknowlogick techknowlogick techknowlogick approved these changes

@lafriks lafriks lafriks approved these changes

@zeripath zeripath zeripath approved these changes

@6543 6543 6543 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.

Cannot remove user from organization from members page Server freezes when transferring the ownership
8 participants
@guillep2k @zeripath @codecov-io @lafriks @bdrpc @techknowlogick @6543 @GiteaBot