Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6d78048b
Commit
6d78048b
authored
Sep 29, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failing spec in ./ee/spec/controllers/projects/jobs_controller_spec.rb
parent
b6824473
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
3 deletions
+21
-3
ee/spec/fixtures/api/schemas/job/job_details.json
ee/spec/fixtures/api/schemas/job/job_details.json
+2
-1
ee/spec/fixtures/api/schemas/job/runners.json
ee/spec/fixtures/api/schemas/job/runners.json
+18
-0
spec/fixtures/api/schemas/job/runners.json
spec/fixtures/api/schemas/job/runners.json
+1
-2
No files found.
ee/spec/fixtures/api/schemas/job/job_details.json
View file @
6d78048b
...
...
@@ -3,7 +3,8 @@
{
"$ref"
:
"../../../../../../spec/fixtures/api/schemas/job/job_details.json"
},
{
"properties"
:
{
"runner"
:
{
"$ref"
:
"runner.json"
}
"runner"
:
{
"$ref"
:
"runner.json"
},
"runners"
:
{
"$ref"
:
"runners.json"
}
}
}
]
...
...
ee/spec/fixtures/api/schemas/job/runners.json
0 → 100644
View file @
6d78048b
{
"type"
:
"object"
,
"properties"
:
{
"quota"
:
{
"description"
:
"Quota information that is only shown for shared runners."
,
"type"
:
"object"
,
"required"
:
[
"used"
,
"limit"
],
"properties"
:
{
"used"
:
{
"type"
:
"integer"
},
"limit"
:
{
"type"
:
"integer"
}
},
"additionalProperties"
:
false
}
}
}
spec/fixtures/api/schemas/job/runners.json
View file @
6d78048b
...
...
@@ -8,6 +8,5 @@
"online"
:
{
"type"
:
"boolean"
},
"available"
:
{
"type"
:
"boolean"
},
"settings_path"
:
{
"type"
:
"string"
}
},
"additionalProperties"
:
false
}
}
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