summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-11-22 14:27:30 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2015-11-23 13:05:22 +0100
commit11728b50f96a296c760d9e69273d304f92e51f8f (patch)
treead5857ebeb7db44b4fa48e51b72001a4e1efa205 /app
parent7b70a03e44559900921f06464ff6422d4ed15712 (diff)
downloadgitlab-ce-11728b50f96a296c760d9e69273d304f92e51f8f.tar.gz
Expose artifacts pathci-artifacts-path
Diffstat (limited to 'app')
-rw-r--r--app/models/application_setting.rb2
-rw-r--r--app/uploaders/artifact_uploader.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 9e70247ef51..b2d5fe1558f 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -99,7 +99,7 @@ class ApplicationSetting < ActiveRecord::Base
restricted_signup_domains: Settings.gitlab['restricted_signup_domains'],
import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git'],
shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'],
- max_artifacts_size: Settings.gitlab_ci['max_artifacts_size'],
+ max_artifacts_size: Settings.artifacts['max_size'],
)
end
diff --git a/app/uploaders/artifact_uploader.rb b/app/uploaders/artifact_uploader.rb
index b4e0fc5772d..1dccc39e7e2 100644
--- a/app/uploaders/artifact_uploader.rb
+++ b/app/uploaders/artifact_uploader.rb
@@ -5,15 +5,15 @@ class ArtifactUploader < CarrierWave::Uploader::Base
attr_accessor :build, :field
def self.artifacts_path
- File.expand_path('shared/artifacts/', Rails.root)
+ Gitlab.config.artifacts.path
end
def self.artifacts_upload_path
- File.expand_path('shared/artifacts/tmp/uploads/', Rails.root)
+ File.join(self.artifacts_path, 'tmp/uploads/')
end
def self.artifacts_cache_path
- File.expand_path('shared/artifacts/tmp/cache/', Rails.root)
+ File.join(self.artifacts_path, 'tmp/cache/')
end
def initialize(build, field)