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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
1925bfd2
Commit
1925bfd2
authored
Aug 22, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec
parent
bbe967ab
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
app/controllers/projects/runners_controller.rb
app/controllers/projects/runners_controller.rb
+1
-1
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+1
-0
spec/models/ci/runner_spec.rb
spec/models/ci/runner_spec.rb
+4
-4
spec/services/ci/retry_build_service_spec.rb
spec/services/ci/retry_build_service_spec.rb
+1
-1
No files found.
app/controllers/projects/runners_controller.rb
View file @
1925bfd2
...
@@ -60,7 +60,7 @@ class Projects::RunnersController < Projects::ApplicationController
...
@@ -60,7 +60,7 @@ class Projects::RunnersController < Projects::ApplicationController
def
runner_params
def
runner_params
params
.
require
(
:runner
).
permit
(
Ci
::
Runner
::
FORM_EDITABLE
).
tap
do
|
params
|
params
.
require
(
:runner
).
permit
(
Ci
::
Runner
::
FORM_EDITABLE
).
tap
do
|
params
|
params
[
'access_level'
]
=
params
[
'access_level'
]
&
.
to_i
params
[
'access_level'
]
=
params
[
'access_level'
]
.
to_i
if
params
[
'access_level'
]
end
end
end
end
end
end
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
1925bfd2
...
@@ -276,6 +276,7 @@ CommitStatus:
...
@@ -276,6 +276,7 @@ CommitStatus:
-
coverage_regex
-
coverage_regex
-
auto_canceled_by_id
-
auto_canceled_by_id
-
retried
-
retried
-
protected
Ci::Variable:
Ci::Variable:
-
id
-
id
-
project_id
-
project_id
...
...
spec/models/ci/runner_spec.rb
View file @
1925bfd2
...
@@ -464,8 +464,8 @@ describe Ci::Runner do
...
@@ -464,8 +464,8 @@ describe Ci::Runner do
end
end
it
'a protected runner exists'
do
it
'a protected runner exists'
do
expect
(
Ci
::
Runner
.
count
).
to
eq
(
1
)
expect
(
described_class
.
count
).
to
eq
(
1
)
expect
(
Ci
::
Runner
.
last
.
protected_?
).
to
eq
(
true
)
expect
(
described_class
.
last
.
protected_?
).
to
eq
(
true
)
end
end
end
end
...
@@ -475,8 +475,8 @@ describe Ci::Runner do
...
@@ -475,8 +475,8 @@ describe Ci::Runner do
end
end
it
'an unprotected runner exists'
do
it
'an unprotected runner exists'
do
expect
(
Ci
::
Runner
.
count
).
to
eq
(
1
)
expect
(
described_class
.
count
).
to
eq
(
1
)
expect
(
Ci
::
Runner
.
last
.
unprotected?
).
to
eq
(
true
)
expect
(
described_class
.
last
.
unprotected?
).
to
eq
(
true
)
end
end
end
end
end
end
...
...
spec/services/ci/retry_build_service_spec.rb
View file @
1925bfd2
...
@@ -22,7 +22,7 @@ describe Ci::RetryBuildService do
...
@@ -22,7 +22,7 @@ describe Ci::RetryBuildService do
%i[type lock_version target_url base_tags
%i[type lock_version target_url base_tags
commit_id deployments erased_by_id last_deployment project_id
commit_id deployments erased_by_id last_deployment project_id
runner_id tag_taggings taggings tags trigger_request_id
runner_id tag_taggings taggings tags trigger_request_id
user_id auto_canceled_by_id retried]
.
freeze
user_id auto_canceled_by_id retried
protected
]
.
freeze
shared_examples
'build duplication'
do
shared_examples
'build duplication'
do
let
(
:stage
)
do
let
(
:stage
)
do
...
...
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