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
19db98a9
Commit
19db98a9
authored
Feb 07, 2018
by
Greg Stark
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move a line to avoid merge conflicts from CE
parent
60f655e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
1 deletion
+1
-1
app/models/ci/build.rb
app/models/ci/build.rb
+0
-1
ee/app/models/ee/ci/build.rb
ee/app/models/ee/ci/build.rb
+1
-0
No files found.
app/models/ci/build.rb
View file @
19db98a9
...
...
@@ -50,7 +50,6 @@ module Ci
end
scope
:with_artifacts_not_expired
,
->
()
{
with_artifacts
.
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_artifacts_stored_locally
,
->
()
{
with_artifacts
.
where
(
artifacts_file_store:
[
nil
,
LegacyArtifactUploader
::
Store
::
LOCAL
])
}
scope
:last_month
,
->
()
{
where
(
'created_at > ?'
,
Date
.
today
-
1
.
month
)
}
scope
:manual_actions
,
->
()
{
where
(
when: :manual
,
status:
COMPLETED_STATUSES
+
[
:manual
])
}
scope
:ref_protected
,
->
{
where
(
protected:
true
)
}
...
...
ee/app/models/ee/ci/build.rb
View file @
19db98a9
...
...
@@ -21,6 +21,7 @@ module EE
scope
:sast
,
->
{
where
(
name:
'sast'
)
}
scope
:sast_container
,
->
{
where
(
name:
'sast:container'
)
}
scope
:dast
,
->
{
where
(
name:
'dast'
)
}
scope
:with_artifacts_stored_locally
,
->
{
with_artifacts
.
where
(
artifacts_file_store:
[
nil
,
LegacyArtifactUploader
::
Store
::
LOCAL
])
}
after_save
:stick_build_if_status_changed
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