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

Migrations: Gitea should not fail just because of no apiConfig return #13229

Merged
merged 8 commits into from
Oct 22, 2020
Merged

Migrations: Gitea should not fail just because of no apiConfig return #13229

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
53da1f6
close #13227
6543 Oct 21, 2020
62c41cb
log it
6543 Oct 21, 2020
53f034b
Merge branch 'master' into fix-gitea2gitea_13227
6543 Oct 21, 2020
dddb321
Merge branch 'master' into fix-gitea2gitea_13227
6543 Oct 21, 2020
dd4f237
Merge branch 'master' into fix-gitea2gitea_13227
6543 Oct 21, 2020
0ddfbc1
Merge branch 'master' into fix-gitea2gitea_13227
6543 Oct 21, 2020
1bac0f5
Merge branch 'master' into fix-gitea2gitea_13227
techknowlogick Oct 22, 2020
6f6a7ea
Merge branch 'master' into fix-gitea2gitea_13227
techknowlogick Oct 22, 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
13 changes: 7 additions & 6 deletions modules/migrations/gitea_downloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,13 @@ func NewGiteaDownloader(ctx context.Context, baseURL, repoPath, username, passwo
// set small maxPerPage since we can only guess
// (default would be 50 but this can differ)
maxPerPage := 10
// new gitea instances can tell us what maximum they have
if giteaClient.CheckServerVersionConstraint(">=1.13.0") == nil {
apiConf, _, err := giteaClient.GetGlobalAPISettings()
if err != nil {
return nil, err
}
// gitea instances >=1.13 can tell us what maximum they have
apiConf, _, err := giteaClient.GetGlobalAPISettings()
if err != nil {
log.Info("Unable to get global API settings. Ignoring these.")
log.Debug("giteaClient.GetGlobalAPISettings. Error: %v", err)
}
if apiConf != nil {
6543 marked this conversation as resolved.
Show resolved Hide resolved
maxPerPage = apiConf.MaxResponseItems
}

Expand Down