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
7152a5ee
Commit
7152a5ee
authored
Sep 16, 2019
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some specs failures
parent
c9b0594e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
app/models/commit_status.rb
app/models/commit_status.rb
+4
-0
app/services/ci/process_pipeline_service.rb
app/services/ci/process_pipeline_service.rb
+1
-4
lib/gitlab/ci/status/grouped_statuses.rb
lib/gitlab/ci/status/grouped_statuses.rb
+1
-1
spec/lib/gitlab/ci/status/composite_status_spec.rb
spec/lib/gitlab/ci/status/composite_status_spec.rb
+0
-1
No files found.
app/models/commit_status.rb
View file @
7152a5ee
...
...
@@ -48,6 +48,10 @@ class CommitStatus < ApplicationRecord
scope
:processables
,
->
{
where
(
type:
%w[Ci::Build Ci::Bridge]
)
}
scope
:for_ids
,
->
(
ids
)
{
where
(
id:
ids
)
}
scope
:with_preloads
,
->
do
preload
(
:project
,
:taggings
,
:deployment
,
:user
)
end
scope
:with_needs
,
->
(
names
=
nil
)
do
needs
=
Ci
::
BuildNeed
.
scoped_build
.
select
(
1
)
needs
=
needs
.
where
(
name:
names
)
if
names
...
...
app/services/ci/process_pipeline_service.rb
View file @
7152a5ee
...
...
@@ -94,10 +94,7 @@ module Ci
def
created_processables_in_stage_without_needs
(
index
)
created_processables_without_needs
.
preload
(
:project
)
.
preload
(
:taggings
)
.
preload
(
:deployment
)
.
preload
(
:user
)
.
with_preloads
.
for_stage
(
index
)
end
...
...
lib/gitlab/ci/status/grouped_statuses.rb
View file @
7152a5ee
...
...
@@ -47,7 +47,7 @@ module Gitlab
columns
<<
:allow_failure
if
!
subject
.
respond_to?
(
:column_names
)
||
subject
.
column_names
.
include?
(
'allow_failure'
)
subject
.
pluck
(
*
columns
)
.
pluck
(
*
columns
)
# rubocop: disable CodeReuse/ActiveRecord
.
map
{
|
attrs
|
columns
.
zip
(
attrs
).
to_h
}
end
...
...
spec/lib/gitlab/ci/status/composite_status_spec.rb
View file @
7152a5ee
...
...
@@ -50,6 +50,5 @@ describe Gitlab::Ci::Status::CompositeStatus do
it_behaves_like
'validate all combinations'
,
0
it_behaves_like
'validate all combinations'
,
1
it_behaves_like
'validate all combinations'
,
2
#it_behaves_like 'validate all combinations', 3
end
end
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