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
676f4879
Commit
676f4879
authored
Dec 03, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failures
parent
6b6fb11a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
app/models/ci/build.rb
app/models/ci/build.rb
+1
-5
spec/factories/ci/job_artifacts.rb
spec/factories/ci/job_artifacts.rb
+1
-1
No files found.
app/models/ci/build.rb
View file @
676f4879
...
@@ -475,11 +475,7 @@ module Ci
...
@@ -475,11 +475,7 @@ module Ci
private
private
def
update_artifacts_size
def
update_artifacts_size
self
.
artifacts_size
=
if
artifacts_file
.
exists?
self
.
artifacts_size
=
legacy_artifacts_file
&
.
size
artifacts_file
.
size
else
nil
end
end
end
def
erase_trace!
def
erase_trace!
...
...
spec/factories/ci/job_artifacts.rb
View file @
676f4879
...
@@ -14,7 +14,7 @@ FactoryGirl.define do
...
@@ -14,7 +14,7 @@ FactoryGirl.define do
after
(
:build
)
do
|
artifact
,
_
|
after
(
:build
)
do
|
artifact
,
_
|
artifact
.
file
=
fixture_file_upload
(
artifact
.
file
=
fixture_file_upload
(
Rails
.
root
.
join
(
'spec/fixtures/ci_build_artifacts.zip'
),
'application/zip'
)
Rails
.
root
.
join
(
'spec/fixtures/ci_build_artifacts.zip'
),
'application/zip'
)
end
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