Skip to content

Complete site's build settings. #61

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

Merged
merged 2 commits into from
Dec 19, 2017
Merged

Complete site's build settings. #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9ec5d2
Complete site's build settings.
calavera Dec 19, 2017
f6fb587
Remove unused models.
calavera Dec 19, 2017
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
54 changes: 32 additions & 22 deletions go/models/repo_setup.go → go/models/repo_info.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 1 addition & 69 deletions go/models/site.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions go/models/site_setup.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 0 additions & 73 deletions go/models/site_setup_all_of1.go
View file
Open in desktop

This file was deleted.

25 changes: 10 additions & 15 deletions swagger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,25 +1406,14 @@ definitions:
pretty_urls:
type: boolean
build_settings:
type: object
properties:
branch:
type: string
dir:
type: string
cmd:
type: string
allowed_branches:
type: array
items:
type: string
$ref: "#/definitions/repoInfo"
siteSetup:
allOf:
- $ref: "#/definitions/site"
- properties:
repo:
$ref: "#/definitions/repoSetup"
repoSetup:
$ref: "#/definitions/repoInfo"
repoInfo:
type: object
properties:
id:
Expand All @@ -1435,7 +1424,7 @@ definitions:
type: string
repo:
type: string
branch:
repo_branch:
type: string
dir:
type: string
Expand All @@ -1449,6 +1438,12 @@ definitions:
type: boolean
private_logs:
type: boolean
repo_url:
type: string
env:
type: object
additionalProperties:
type: string
submission:
type: object
properties:
Expand Down
Loading