Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Upstream
Gitea
Commits
d252d4eb
Commit
d252d4eb
authored
6 years ago
by
Thomas Loubiou
Committed by
Lauris BH
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Remove extra spaces (#6016)
parent
8c865f3c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/auth/repo_form.go
+1
-1
modules/auth/repo_form.go
templates/swagger/v1_json.tmpl
+3
-3
templates/swagger/v1_json.tmpl
with
4 additions
and
4 deletions
+4
-4
modules/auth/repo_form.go
View file @
d252d4eb
...
@@ -367,7 +367,7 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error
...
@@ -367,7 +367,7 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error
// swagger:model MergePullRequestOption
// swagger:model MergePullRequestOption
type
MergePullRequestForm
struct
{
type
MergePullRequestForm
struct
{
// required: true
// required: true
// enum: merge,
rebase,
rebase-merge,
squash
// enum: merge,rebase,rebase-merge,squash
Do
string
`binding:"Required;In(merge,rebase,rebase-merge,squash)"`
Do
string
`binding:"Required;In(merge,rebase,rebase-merge,squash)"`
MergeTitleField
string
MergeTitleField
string
MergeMessageField
string
MergeMessageField
string
...
...
This diff is collapsed.
Click to expand it.
templates/swagger/v1_json.tmpl
View file @
d252d4eb
...
@@ -7718,9 +7718,9 @@
...
@@ -7718,9 +7718,9 @@
"type": "string",
"type": "string",
"enum": [
"enum": [
"merge",
"merge",
"
rebase",
"rebase",
"
rebase-merge",
"rebase-merge",
"
squash"
"squash"
]
]
},
},
"MergeMessageField": {
"MergeMessageField": {
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment