Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix add team on collaborator page when same name as organization #9767

Merged

Conversation

davidsvantesson
Copy link
Contributor

Fix #9662

I think the intention of this code was to ignore if user tries to add "Owner" team to repository. The owner team is added to the repo anyhow and will be detected as a duplicate, so this check is not needed.

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 14, 2020
@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 14, 2020
@techknowlogick techknowlogick added this to the 1.12.0 milestone Jan 15, 2020
@6543
Copy link
Member

6543 commented Jan 15, 2020

should we backport this to 1.10.3 ?

@lunny
Copy link
Member

lunny commented Jan 15, 2020

@6543 I think we should.

@codecov-io
Copy link

codecov-io commented Jan 15, 2020

Codecov Report

Merging #9767 into master will decrease coverage by 0.04%.
The diff coverage is 32.36%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9767      +/-   ##
==========================================
- Coverage    42.2%   42.16%   -0.05%     
==========================================
  Files         602      603       +1     
  Lines       78669    78834     +165     
==========================================
+ Hits        33206    33241      +35     
- Misses      41399    41522     +123     
- Partials     4064     4071       +7
Impacted Files Coverage Δ
models/migrations/migrations.go 1.3% <ø> (ø) ⬆️
modules/migrations/base/pullrequest.go 0% <ø> (ø) ⬆️
models/user.go 50.46% <0%> (-0.26%) ⬇️
models/issue.go 54.81% <0%> (-0.62%) ⬇️
models/migrations/v123.go 0% <0%> (ø)
modules/migrations/gitea.go 6.89% <0%> (-1.03%) ⬇️
routers/repo/issue.go 38.01% <0%> (ø) ⬆️
models/migrate.go 0% <0%> (ø) ⬆️
models/external_login_user.go 21.29% <0%> (-0.61%) ⬇️
routers/api/v1/repo/issue_reaction.go 75.27% <100%> (ø) ⬆️
... and 7 more

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 009d375...7b7adad. Read the comment docs.

@6543
Copy link
Member

6543 commented Jan 15, 2020

@davidsvantesson can you send backport to 1.10.3?

@sapk sapk merged commit f162a32 into go-gitea:master Jan 15, 2020
@techknowlogick techknowlogick added the backport/done All backports for this PR have been created label Jan 15, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
# for free to subscribe to this conversation on GitHub. Already have an account? #.
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.

Not possible to add a team to a repository with the same name of the organization
8 participants