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
21c36785
Commit
21c36785
authored
Nov 27, 2017
by
Zeger-Jan van de Weg
Committed by
Kamil Trzcinski
Dec 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Ci::Build#artifacts_file?
parent
4af52536
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
9 deletions
+5
-9
app/models/concerns/artifact_migratable.rb
app/models/concerns/artifact_migratable.rb
+0
-4
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+1
-1
spec/services/projects/update_pages_service_spec.rb
spec/services/projects/update_pages_service_spec.rb
+4
-4
No files found.
app/models/concerns/artifact_migratable.rb
View file @
21c36785
...
...
@@ -6,10 +6,6 @@ module ArtifactMigratable
job_archive
&
.
file
||
legacy_artifacts_file
end
def
artifacts_file?
job_archive
&
.
file?
||
legacy_artifacts_file?
end
def
artifacts_metadata
job_metadata
&
.
file
||
legacy_artifacts_metadata
end
...
...
lib/gitlab/workhorse.rb
View file @
21c36785
...
...
@@ -58,7 +58,7 @@ module Gitlab
end
def
artifact_upload_ok
{
TempPath
:
Legacy
ArtifactUploader
.
artifacts_upload_path
}
{
TempPath
:
Job
ArtifactUploader
.
artifacts_upload_path
}
end
def
send_git_blob
(
repository
,
blob
)
...
...
spec/services/projects/update_pages_service_spec.rb
View file @
21c36785
...
...
@@ -39,7 +39,7 @@ describe Projects::UpdatePagesService do
it
"doesn't delete artifacts"
do
expect
(
execute
).
to
eq
(
:success
)
expect
(
build
.
reload
.
artifacts
_file
?
).
to
eq
(
true
)
expect
(
build
.
reload
.
artifacts?
).
to
eq
(
true
)
end
end
...
...
@@ -47,7 +47,7 @@ describe Projects::UpdatePagesService do
it
"does delete artifacts"
do
expect
(
execute
).
to
eq
(
:success
)
expect
(
build
.
reload
.
artifacts
_file
?
).
to
eq
(
false
)
expect
(
build
.
reload
.
artifacts?
).
to
eq
(
false
)
end
end
end
...
...
@@ -110,7 +110,7 @@ describe Projects::UpdatePagesService do
it
"doesn't delete artifacts"
do
expect
(
execute
).
to
eq
(
:success
)
expect
(
build
.
artifacts
_file
?
).
to
eq
(
true
)
expect
(
build
.
artifacts?
).
to
eq
(
true
)
end
end
...
...
@@ -118,7 +118,7 @@ describe Projects::UpdatePagesService do
it
"does delete artifacts"
do
expect
(
execute
).
to
eq
(
:success
)
expect
(
build
.
reload
.
artifacts
_file
?
).
to
eq
(
false
)
expect
(
build
.
reload
.
artifacts?
).
to
eq
(
false
)
end
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