diff options
| author | mrsdizzie <info@mrsdizzie.com> | 2019-07-07 22:14:12 -0400 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2019-07-08 10:14:12 +0800 |
| commit | 1f1ecda541d7f526c004e7bfabab814dbc84dc2c (patch) | |
| tree | b53d4e692de9b4a5cc0ebfebf09a4cb5d8d5880f /modules/migrations/base | |
| parent | fcda2d5b35ec9bec9a8e8fa0a0fb04cb21593648 (diff) | |
| download | gitea-1f1ecda541d7f526c004e7bfabab814dbc84dc2c.tar.gz gitea-1f1ecda541d7f526c004e7bfabab814dbc84dc2c.zip | |
Display original author and URL information when showing migrated issues/comments (#7352)
* Store original author info for migrated issues and comments
Keep original author name for displaying in Gitea interface and also
store original author user ID for potential future use in linking
accounts from old location.
* Add original_url for repo
Store the original URL for a migrated repo
Clean up migrations/tests
* fix migration
* fix golangci-lint
* make 'make revive' happy also
* Modify templates to use OriginalAuthor if set
Use the original author name in templates if it is set rather than the
user who migrated/currently owns the issues
* formatting fixes
* make generate-swagger
* Use default avatar for imported comments
* Remove no longer used IgnoreIssueAuthor option
* Add OriginalAuthorID to swagger also
Diffstat (limited to 'modules/migrations/base')
| -rw-r--r-- | modules/migrations/base/comment.go | 1 | ||||
| -rw-r--r-- | modules/migrations/base/issue.go | 1 | ||||
| -rw-r--r-- | modules/migrations/base/options.go | 20 | ||||
| -rw-r--r-- | modules/migrations/base/pullrequest.go | 1 | ||||
| -rw-r--r-- | modules/migrations/base/repo.go | 1 |
5 files changed, 14 insertions, 10 deletions
diff --git a/modules/migrations/base/comment.go b/modules/migrations/base/comment.go index d89ec3a3f5..38c544d6e0 100644 --- a/modules/migrations/base/comment.go +++ b/modules/migrations/base/comment.go @@ -10,6 +10,7 @@ import "time" // Comment is a standard comment information type Comment struct { IssueIndex int64 + PosterID int64 PosterName string PosterEmail string Created time.Time diff --git a/modules/migrations/base/issue.go b/modules/migrations/base/issue.go index ddadd0c2b3..08d947b05d 100644 --- a/modules/migrations/base/issue.go +++ b/modules/migrations/base/issue.go @@ -10,6 +10,7 @@ import "time" // Issue is a standard issue information type Issue struct { Number int64 + PosterID int64 PosterName string PosterEmail string Title string diff --git a/modules/migrations/base/options.go b/modules/migrations/base/options.go index 262981b933..ba7fdc6815 100644 --- a/modules/migrations/base/options.go +++ b/modules/migrations/base/options.go @@ -12,15 +12,15 @@ type MigrateOptions struct { AuthPassword string Name string Description string + OriginalURL string - Wiki bool - Issues bool - Milestones bool - Labels bool - Releases bool - Comments bool - PullRequests bool - Private bool - Mirror bool - IgnoreIssueAuthor bool // if true will not add original author information before issues or comments content. + Wiki bool + Issues bool + Milestones bool + Labels bool + Releases bool + Comments bool + PullRequests bool + Private bool + Mirror bool } diff --git a/modules/migrations/base/pullrequest.go b/modules/migrations/base/pullrequest.go index 515cab3f91..42456fd314 100644 --- a/modules/migrations/base/pullrequest.go +++ b/modules/migrations/base/pullrequest.go @@ -15,6 +15,7 @@ type PullRequest struct { Number int64 Title string PosterName string + PosterID int64 PosterEmail string Content string Milestone string diff --git a/modules/migrations/base/repo.go b/modules/migrations/base/repo.go index 907d8fc09e..5cfb0de920 100644 --- a/modules/migrations/base/repo.go +++ b/modules/migrations/base/repo.go @@ -15,4 +15,5 @@ type Repository struct { AuthUsername string AuthPassword string CloneURL string + OriginalURL string } |