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

Make branch parameter optional for /api/v1/repos/{owner}/{repo}/contents/{filepath} #11067

Merged
merged 14 commits into from
Apr 20, 2020
Merged

Make branch parameter optional for /api/v1/repos/{owner}/{repo}/contents/{filepath} #11067

Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6ccfe68
api file contend: optional branch
6543 Apr 14, 2020
28db4fa
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 14, 2020
9a73f69
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 14, 2020
f0090a1
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 15, 2020
82ffa1a
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 15, 2020
4161f21
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 16, 2020
6733f3d
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 16, 2020
ad898d7
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 16, 2020
710fe16
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 17, 2020
7cd1a10
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 18, 2020
44ae550
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 19, 2020
06763d9
Merge branch 'master' into fix-api_11006_optional-branch
6543 Apr 20, 2020
9cd8a22
Merge branch 'master' into fix-api_11006_optional-branch
zeripath Apr 20, 2020
20b03e6
Merge branch 'master' into fix-api_11006_optional-branch
zeripath Apr 20, 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
12 changes: 12 additions & 0 deletions routers/api/v1/repo/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ func CreateFile(ctx *context.APIContext, apiOpts api.CreateFileOptions) {
// "201":
// "$ref": "#/responses/FileResponse"

if apiOpts.BranchName == "" {
apiOpts.BranchName = ctx.Repo.Repository.DefaultBranch
}

opts := &repofiles.UpdateRepoFileOptions{
Content: apiOpts.Content,
IsNewFile: true,
Expand Down Expand Up @@ -271,6 +275,10 @@ func UpdateFile(ctx *context.APIContext, apiOpts api.UpdateFileOptions) {
// "200":
// "$ref": "#/responses/FileResponse"

if apiOpts.BranchName == "" {
apiOpts.BranchName = ctx.Repo.Repository.DefaultBranch
}

opts := &repofiles.UpdateRepoFileOptions{
Content: apiOpts.Content,
SHA: apiOpts.SHA,
Expand Down Expand Up @@ -377,6 +385,10 @@ func DeleteFile(ctx *context.APIContext, apiOpts api.DeleteFileOptions) {
return
}

if apiOpts.BranchName == "" {
apiOpts.BranchName = ctx.Repo.Repository.DefaultBranch
}

opts := &repofiles.DeleteRepoFileOptions{
Message: apiOpts.Message,
OldBranch: apiOpts.BranchName,
Expand Down