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

Add support for migrating from Gitlab #9084

Merged
merged 52 commits into from
Apr 19, 2020
Merged

Add support for migrating from Gitlab #9084

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
0a8bd8a
First stab at a Gitlab migrations interface.
aqtrans Nov 18, 2019
f58c065
Modify JS to show migration for Gitlab
aqtrans Nov 19, 2019
b10ed23
Properly strip out #gitlab tag from repo name
aqtrans Nov 19, 2019
823d181
Working Gitlab migrations!
aqtrans Nov 19, 2019
eaf52a4
Try #2 at trying to hide credentials.
aqtrans Nov 19, 2019
4efa640
Add go-gitlab dependency
aqtrans Nov 19, 2019
d651d11
Vendor go-gitlab
aqtrans Nov 19, 2019
9b38e86
Use gitlab.BasicAuthClient
aqtrans Nov 19, 2019
ee4cefa
Replaced repoPath with repoID globally.
aqtrans Nov 19, 2019
f61f9cd
Logging touchup
aqtrans Nov 19, 2019
1a47b38
Properly set private repo status.
aqtrans Nov 19, 2019
88b8918
Add go-gitlab vendor cache
aqtrans Nov 19, 2019
22a6080
Fix PR migrations:
aqtrans Nov 20, 2019
9f316b3
Ensure merged PRs are closed and set with the proper time
aqtrans Nov 20, 2019
c993d84
Remove copyright and some commented code
aqtrans Nov 20, 2019
0aa2da8
Rip out '#gitlab' based self-hosted Gitlab support
aqtrans Nov 20, 2019
356b5ac
Hide given credentials for migrated repos.
aqtrans Nov 19, 2019
0af580a
Use asset.URL directly, no point in parsing.
aqtrans Nov 25, 2019
936e3f0
Fix importing Milestones.
aqtrans Nov 27, 2019
9258610
Fix Gitlab Milestone migration if DueDate isn't set
aqtrans Dec 4, 2019
9befc70
Empty Milestone due dates properly return nil, not zero time
aqtrans Dec 4, 2019
61ad1a2
Add GITLAB_READ_TOKEN to drone unit-test step
aqtrans Dec 4, 2019
b12c8c2
Add working gitlab_test.go.
aqtrans Dec 4, 2019
476cb3b
Merge branch 'master' into gitlab-migrate
aqtrans Dec 5, 2019
40bc377
Fix linting issues
aqtrans Dec 5, 2019
52cfcde
Add modified JS files
aqtrans Dec 5, 2019
fe63bba
Remove pre-build JS files
aqtrans Dec 7, 2019
43eaf85
Merge branch 'master', remote-tracking branch 'upstream' into gitlab-…
aqtrans Dec 7, 2019
52b0021
Only merged PRs are marged as merged/closed
aqtrans Dec 8, 2019
7a66ced
Test topics
aqtrans Dec 8, 2019
e278651
Skip test if gitlab is inaccessible
aqtrans Dec 8, 2019
f9fe81f
Grab personal token from username, not password.
aqtrans Dec 9, 2019
97038d4
Merge branch 'master' of https://github.com/go-gitea/gitea into gitla…
aqtrans Jan 19, 2020
12bec11
Add SetContext() to GitlabDownloader.
aqtrans Jan 19, 2020
2a72164
Merge branch 'master' into gitlab-migrate
techknowlogick Feb 17, 2020
228a553
Merge branch 'master' of https://github.com/go-gitea/gitea into gitla…
aqtrans Mar 1, 2020
9a0d02c
Checking Updated field in Issues.
aqtrans Mar 1, 2020
0497f61
Merge branch 'gitlab-migrate' of github.com:aqtrans/gitea into gitlab…
aqtrans Mar 1, 2020
e731c2d
Actually fetch Issue Updated time from Gitlab
aqtrans Mar 1, 2020
958f2d7
Add Gitlab migration GetReviews() stub
aqtrans Mar 1, 2020
48efb1f
Fix Patch and Clone URLs
aqtrans Mar 1, 2020
4657268
Merge branch 'master' into gitlab-migrate
techknowlogick Mar 19, 2020
6edbb44
check Updated too
6543 Mar 31, 2020
b839aa4
fix mod
6543 Mar 31, 2020
a224698
Merge pull request #2 from 6543-forks/gitlab-m-fix
aqtrans Apr 8, 2020
00f8b3a
Merge branch 'master' into gitlab-migrate
aqtrans Apr 8, 2020
90b8f42
make vendor with go1.14
6543 Apr 10, 2020
7fec22e
Merge pull request #3 from 6543-forks/gitlab_migrate-fix
aqtrans Apr 11, 2020
29937a9
Merge branch 'master' into gitlab-migrate
lafriks Apr 17, 2020
4dd6e89
Merge branch 'master' into gitlab-migrate
6543 Apr 19, 2020
a651248
Merge branch 'master' into gitlab-migrate
lunny Apr 19, 2020
f5988e8
Merge branch 'master' into gitlab-migrate
lunny Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ require (
github.com/unknwon/paginater v0.0.0-20151104151617-7748a72e0141
github.com/urfave/cli v1.20.0
github.com/willf/bitset v0.0.0-20180426185212-8ce1146b8621 // indirect
github.com/xanzy/go-gitlab v0.22.1
github.com/yohcop/openid-go v0.0.0-20160914080427-2c050d2dae53
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad
golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9
Expand Down
5 changes: 5 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,8 @@ github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/willf/bitset v0.0.0-20180426185212-8ce1146b8621 h1:E8u341JM/N8LCnPXBV6ZFD1RKo/j+qHl1XOqSV+GstA=
github.com/willf/bitset v0.0.0-20180426185212-8ce1146b8621/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
github.com/xanzy/go-gitlab v0.22.1 h1:TVxgHmoa35jQL+9FCkG0nwPDxU9dQZXknBTDtGaSFno=
github.com/xanzy/go-gitlab v0.22.1/go.mod h1:t4Bmvnxj7k37S4Y17lfLx+nLqkf/oQwT2HagfWKv5Og=
github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
Expand Down Expand Up @@ -602,6 +604,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand All @@ -623,6 +626,7 @@ golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9 h1:DPz9iiH3YoKiKhX/ijjoZvT0V
golang.org/x/net v0.0.0-20191101175033-0deb6923b6d9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/oauth2 v0.0.0-20180620175406-ef147856a6dd/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -693,6 +697,7 @@ google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEn
google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
Expand Down
2 changes: 1 addition & 1 deletion models/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func CreateMigrateTask(doer, u *User, opts base.MigrateOptions) (*Task, error) {
repo, err := CreateRepository(doer, u, CreateRepoOptions{
Name: opts.RepoName,
Description: opts.Description,
OriginalURL: opts.CloneAddr,
OriginalURL: opts.OriginalURL,
IsPrivate: opts.Private,
IsMirror: opts.Mirror,
Status: RepositoryBeingMigrated,
Expand Down
Loading