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 remove team member issue #3566

Merged
merged 1 commit into from
Feb 23, 2018

Conversation

xwjdsh
Copy link
Contributor

@xwjdsh xwjdsh commented Feb 23, 2018

Fixes #3410

@codecov-io
Copy link

codecov-io commented Feb 23, 2018

Codecov Report

Merging #3566 into master will increase coverage by 0.01%.
The diff coverage is 71.42%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3566      +/-   ##
==========================================
+ Coverage   35.78%   35.79%   +0.01%     
==========================================
  Files         285      285              
  Lines       40850    40863      +13     
==========================================
+ Hits        14617    14628      +11     
- Misses      24065    24067       +2     
  Partials     2168     2168
Impacted Files Coverage Δ
models/org_team.go 54.7% <70%> (+0.15%) ⬆️
models/org.go 68.22% <72.72%> (+0.34%) ⬆️
models/repo_list.go 65.62% <0%> (-1.57%) ⬇️
models/repo_indexer.go 48.3% <0%> (ø) ⬆️
modules/process/manager.go 81.15% <0%> (+4.34%) ⬆️

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 19bf4dd...53a6ccb. Read the comment docs.

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 23, 2018
@@ -523,6 +516,16 @@ func RemoveOrgUser(orgID, userID int64) error {
return sess.Commit()
Copy link
Member

Choose a reason for hiding this comment

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

Put sess.Commit() out of the function is a good habit I think.

@lunny lunny added this to the 1.5.0 milestone Feb 23, 2018
@lunny lunny added the type/bug label Feb 23, 2018
@xwjdsh
Copy link
Contributor Author

xwjdsh commented Feb 23, 2018

@lunny You are right, changed.

@tboerger tboerger 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 Feb 23, 2018
@@ -10,6 +10,7 @@ import (
"strings"

"code.gitea.io/gitea/modules/log"
"github.com/go-xorm/xorm"
Copy link
Member

Choose a reason for hiding this comment

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

Add an empty line between local and external package.

Copy link
Member

@appleboy appleboy left a comment

Choose a reason for hiding this comment

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

coding style for import package

Put sess.Commit() out of the RemoveOrgUser function

Add an empty line to separate import packages
@xwjdsh
Copy link
Contributor Author

xwjdsh commented Feb 23, 2018

@appleboy Updated.

@tboerger tboerger 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 Feb 23, 2018
@appleboy appleboy merged commit 2d1c5c3 into go-gitea:master Feb 23, 2018
@xwjdsh xwjdsh deleted the remove_organization_user branch February 23, 2018 09:19
@lafriks
Copy link
Member

lafriks commented Feb 23, 2018

@xwjdsh can you backport this to release/v1.4 branch?

@xwjdsh xwjdsh restored the remove_organization_user branch February 23, 2018 15:54
xwjdsh added a commit to xwjdsh/gitea that referenced this pull request Feb 23, 2018
Put sess.Commit() out of the RemoveOrgUser function

Add an empty line to separate import packages

Signed-off-by: Wendell Sun <iwendellsun@gmail.com>
@lafriks lafriks added the backport/done All backports for this PR have been created label Feb 23, 2018
lafriks pushed a commit that referenced this pull request Feb 23, 2018
Signed-off-by: Wendell Sun <iwendellsun@gmail.com>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 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.

Removing a user from an organization
7 participants