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

Move EmailAddress & UserRedirect into models/user/ #17607

Merged
merged 12 commits into from Nov 11, 2021
Merged

Move EmailAddress & UserRedirect into models/user/ #17607

merged 12 commits into from Nov 11, 2021

Conversation

lunny
Copy link
Member

@lunny lunny commented Nov 10, 2021

As title

@lunny lunny added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Nov 10, 2021
wxiaoguang
wxiaoguang approved these changes Nov 10, 2021
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

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

I can feel there are some conflicts with https://github.com/go-gitea/gitea/pull/17577 Remove NewSession method from db.Engine interface ....

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Nov 10, 2021
@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 Nov 10, 2021
@lunny lunny changed the title Move EmailAddress into models/user/ Move EmailAddress & UserRedirect into models/user/ Nov 10, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #17607 (b127999) into main (30515f2) will increase coverage by 0.01%.
The diff coverage is 48.27%.

❗ Current head b127999 differs from pull request most recent head ee36699. Consider uploading reports for the commit ee36699 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##             main   #17607      +/-   ##
==========================================
+ Coverage   45.48%   45.50%   +0.01%     
==========================================
  Files         793      795       +2     
  Lines       88846    88861      +15     
==========================================
+ Hits        40416    40433      +17     
+ Misses      41918    41912       -6     
- Partials     6512     6516       +4
Impacted Files Coverage Δ
models/db/error.go 0.00% <0.00%> (ø)
models/error.go 38.47% <ø> (-1.04%) ⬇️
models/issue_comment.go 51.60% <0.00%> (ø)
models/issue_dependency.go 63.76% <0.00%> (ø)
models/issue_reaction.go 82.87% <0.00%> (ø)
models/lfs_lock.go 57.14% <0.00%> (ø)
models/notification.go 64.71% <0.00%> (-1.44%) ⬇️
models/repo_avatar.go 35.78% <0.00%> (ø)
models/repo_collaboration.go 57.89% <0.00%> (ø)
models/repo_generate.go 15.00% <0.00%> (ø)
... and 126 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 a4dc0c5...ee36699. Read the comment docs.

@lunny
Copy link
Member Author

lunny commented Nov 11, 2021

make L-G-T-M work

@lunny lunny merged commit 90eb9fb into go-gitea:main Nov 11, 2021
@lunny lunny deleted the lunny/model_email_address branch November 11, 2021 07:03
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
@lunny
Move EmailAddress & UserRedirect into models/user/ (go-gitea#17607)
41e15b7 
* Move EmailAddress into models/user/

* Fix test

* rename user_mail to user_email

* Fix test

* Move UserRedirect into models/user/

* Fix lint & test

* Fix lint

* Fix lint

* remove nolint comment

* Fix lint
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@Gusted Gusted Gusted approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lunny @codecov-commenter @wxiaoguang @Gusted @GiteaBot