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
d7f8a0ce
Commit
d7f8a0ce
authored
Jul 17, 2018
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failures
parent
270f858f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/models/ci/build.rb
app/models/ci/build.rb
+2
-2
app/models/commit_status.rb
app/models/commit_status.rb
+1
-1
app/services/ci/register_job_service.rb
app/services/ci/register_job_service.rb
+1
-1
No files found.
app/models/ci/build.rb
View file @
d7f8a0ce
...
@@ -344,7 +344,7 @@ module Ci
...
@@ -344,7 +344,7 @@ module Ci
end
end
def
runner_required_features
def
runner_required_features
%w(variables)
[]
end
end
def
merge_request
def
merge_request
...
@@ -602,7 +602,7 @@ module Ci
...
@@ -602,7 +602,7 @@ module Ci
def
supported_runner?
(
features
)
def
supported_runner?
(
features
)
runner_required_features
.
all?
do
|
feature_name
|
runner_required_features
.
all?
do
|
feature_name
|
features
[
feature_name
]
features
&
.
dig
(
feature_name
)
end
end
end
end
...
...
app/models/commit_status.rb
View file @
d7f8a0ce
...
@@ -47,7 +47,7 @@ class CommitStatus < ActiveRecord::Base
...
@@ -47,7 +47,7 @@ class CommitStatus < ActiveRecord::Base
stuck_or_timeout_failure:
3
,
stuck_or_timeout_failure:
3
,
runner_system_failure:
4
,
runner_system_failure:
4
,
missing_dependency_failure:
5
,
missing_dependency_failure:
5
,
runner_unsupported:
6
,
runner_unsupported:
6
}
}
##
##
...
...
app/services/ci/register_job_service.rb
View file @
d7f8a0ce
...
@@ -83,7 +83,7 @@ module Ci
...
@@ -83,7 +83,7 @@ module Ci
end
end
build
.
run!
build
.
run!
return
true
true
end
end
def
builds_for_shared_runner
def
builds_for_shared_runner
...
...
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