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

Fix sqlite lock #5176

Merged
merged 4 commits into from
Oct 25, 2018
Merged

Fix sqlite lock #5176

merged 4 commits into from
Oct 25, 2018

Conversation

lunny
Copy link
Member

@lunny lunny commented Oct 25, 2018

No description provided.

@lunny lunny added the type/bug label Oct 25, 2018
@lunny lunny added this to the 1.7.0 milestone Oct 25, 2018
models/repo.go Outdated
return repo.checkUnitUser(x, userID, isAdmin, unitType)
}

func (repo *Repository) checkUnitUser(e Engine, userID int64, isAdmin bool, unitType UnitType) bool {
if err := repo.getUnitsByUserID(x, userID, isAdmin); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

The parameter e should be used here?

Copy link
Member Author

Choose a reason for hiding this comment

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

done and also fixed another place.

Copy link
Contributor

Choose a reason for hiding this comment

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

LGTM

@bkcsoft bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 25, 2018
@bkcsoft bkcsoft 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 Oct 25, 2018
@codecov-io
Copy link

codecov-io commented Oct 25, 2018

Codecov Report

Merging #5176 into master will increase coverage by <.01%.
The diff coverage is 44.44%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #5176      +/-   ##
=========================================
+ Coverage   37.49%   37.5%   +<.01%     
=========================================
  Files         309     309              
  Lines       45786   45790       +4     
=========================================
+ Hits        17169   17173       +4     
  Misses      26156   26156              
  Partials     2461    2461
Impacted Files Coverage Δ
models/notification.go 73.36% <0%> (ø) ⬆️
models/org_team.go 51.27% <33.33%> (-0.22%) ⬇️
models/repo.go 43.5% <75%> (+0.06%) ⬆️
models/repo_list.go 63.37% <0%> (+1.16%) ⬆️

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 554581f...e103aaf. Read the comment docs.

@bkcsoft bkcsoft 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 Oct 25, 2018
@lunny lunny merged commit 5f938c0 into go-gitea:master Oct 25, 2018
@lunny lunny deleted the lunny/fix_lock branch October 25, 2018 10:55
lunny added a commit to lunny/gitea that referenced this pull request Oct 25, 2018
* fix sqlite lock

* fix sqlite lock on getUnitType
@lunny lunny mentioned this pull request Oct 25, 2018
@lunny lunny added the backport/done All backports for this PR have been created label Oct 25, 2018
lafriks pushed a commit that referenced this pull request Oct 25, 2018
* fix sqlite lock

* fix sqlite lock on getUnitType
@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
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
Development

Successfully merging this pull request may close these issues.

None yet

7 participants