summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2016-09-30 10:03:45 +0000
committerValery Sizov <valery@gitlab.com>2016-09-30 10:03:45 +0000
commitf80e7683237a4aca01ff3d0c729c4933dde8753c (patch)
tree3a1dd33d9ffeac2669470dddb236f6c8e0e2eaa0
parentf9887a10d43fc3b382d1ef270431823d1d4491a6 (diff)
parent32e32fa0fd45ef091fe4c4639313c3e281bfc5df (diff)
downloadgitlab-ce-f80e7683237a4aca01ff3d0c729c4933dde8753c.tar.gz
Merge branch '22768-revert-to-touch-file-system' into 'master'
Revert to use Mounter method to check existence ## What does this MR do? Revert a change on gitlab-ce that we never get into gitlab-ee due to spec failures and a lack of a proper solution. So we want to keep both repos in the same codebase about this. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22768 See merge request !6590
-rw-r--r--CHANGELOG1
-rw-r--r--app/models/ci/build.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1eb7ea15756..41d8c5b7c8f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ v 8.13.0 (unreleased)
- Only update issuable labels if they have been changed
- Revoke button in Applications Settings underlines on hover.
- Fix Long commit messages overflow viewport in file tree
+ - Revert avoid touching file system on Build#artifacts?
- Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe)
- Fix unnecessary escaping of reserved HTML characters in milestone title. !6533
- Add organization field to user profile
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 522e2264bb8..5dbf66173de 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -373,7 +373,7 @@ module Ci
end
def artifacts?
- !artifacts_expired? && self[:artifacts_file].present?
+ !artifacts_expired? && artifacts_file.exists?
end
def artifacts_metadata?