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
Léo-Paul Géneau
gitlab-ce
Commits
4bca0670
Commit
4bca0670
authored
Mar 13, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clarify ambiguous with_artifacts implication
parent
842f42f4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
app/models/ci/build.rb
app/models/ci/build.rb
+4
-4
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-1
app/models/project.rb
app/models/project.rb
+1
-1
No files found.
app/models/ci/build.rb
View file @
4bca0670
...
@@ -41,12 +41,12 @@ module Ci
...
@@ -41,12 +41,12 @@ module Ci
scope
:unstarted
,
->
()
{
where
(
runner_id:
nil
)
}
scope
:unstarted
,
->
()
{
where
(
runner_id:
nil
)
}
scope
:ignore_failures
,
->
()
{
where
(
allow_failure:
false
)
}
scope
:ignore_failures
,
->
()
{
where
(
allow_failure:
false
)
}
scope
:with_artifacts
,
->
()
do
scope
:with_artifacts
,
->
(
file_type
)
do
where
(
'(artifacts_file IS NOT NULL AND artifacts_file <> ?) OR EXISTS (?)'
,
where
(
'(artifacts_file IS NOT NULL AND artifacts_file <> ?) OR EXISTS (?)'
,
''
,
Ci
::
JobArtifact
.
select
(
1
).
where
(
'ci_builds.id = ci_job_artifacts.job_id'
))
''
,
Ci
::
JobArtifact
.
select
(
1
).
where
(
'ci_builds.id = ci_job_artifacts.job_id'
)
.
public_send
(
file_type
)
)
end
end
scope
:with_artifacts_not_expired
,
->
()
{
with_artifacts
.
where
(
'artifacts_expire_at IS NULL OR artifacts_expire_at > ?'
,
Time
.
now
)
}
scope
:with_artifacts_not_expired
,
->
()
{
with_artifacts
(
:archive
)
.
where
(
'artifacts_expire_at IS NULL OR artifacts_expire_at > ?'
,
Time
.
now
)
}
scope
:with_expired_artifacts
,
->
()
{
with_artifacts
.
where
(
'artifacts_expire_at < ?'
,
Time
.
now
)
}
scope
:with_expired_artifacts
,
->
()
{
with_artifacts
(
:archive
)
.
where
(
'artifacts_expire_at < ?'
,
Time
.
now
)
}
scope
:last_month
,
->
()
{
where
(
'created_at > ?'
,
Date
.
today
-
1
.
month
)
}
scope
:last_month
,
->
()
{
where
(
'created_at > ?'
,
Date
.
today
-
1
.
month
)
}
scope
:manual_actions
,
->
()
{
where
(
when: :manual
,
status:
COMPLETED_STATUSES
+
[
:manual
])
}
scope
:manual_actions
,
->
()
{
where
(
when: :manual
,
status:
COMPLETED_STATUSES
+
[
:manual
])
}
scope
:ref_protected
,
->
{
where
(
protected:
true
)
}
scope
:ref_protected
,
->
{
where
(
protected:
true
)
}
...
...
app/models/ci/pipeline.rb
View file @
4bca0670
...
@@ -514,7 +514,7 @@ module Ci
...
@@ -514,7 +514,7 @@ module Ci
# We purposely cast the builds to an Array here. Because we always use the
# We purposely cast the builds to an Array here. Because we always use the
# rows if there are more than 0 this prevents us from having to run two
# rows if there are more than 0 this prevents us from having to run two
# queries: one to get the count and one to get the rows.
# queries: one to get the count and one to get the rows.
@latest_builds_with_artifacts
||=
builds
.
latest
.
with_artifacts
.
to_a
@latest_builds_with_artifacts
||=
builds
.
latest
.
with_artifacts
(
:archive
)
.
to_a
end
end
private
private
...
...
app/models/project.rb
View file @
4bca0670
...
@@ -542,7 +542,7 @@ class Project < ActiveRecord::Base
...
@@ -542,7 +542,7 @@ class Project < ActiveRecord::Base
latest_pipeline
=
pipelines
.
latest_successful_for
(
ref
)
latest_pipeline
=
pipelines
.
latest_successful_for
(
ref
)
if
latest_pipeline
if
latest_pipeline
latest_pipeline
.
builds
.
latest
.
with_artifacts
latest_pipeline
.
builds
.
latest
.
with_artifacts
(
:archive
)
else
else
builds
.
none
builds
.
none
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