summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/initializers/1_settings.rb2
-rw-r--r--doc/ci/yaml/README.md2
-rw-r--r--lib/ci/api/builds.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index b39e263e39a..302124bd977 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -186,7 +186,7 @@ Settings.gitlab_ci['all_broken_builds'] = true if Settings.gitlab_ci['all_br
Settings.gitlab_ci['add_pusher'] = false if Settings.gitlab_ci['add_pusher'].nil?
Settings.gitlab_ci['url'] ||= Settings.send(:build_gitlab_ci_url)
Settings.gitlab_ci['builds_path'] = File.expand_path(Settings.gitlab_ci['builds_path'] || "builds/", Rails.root)
-Settings.gitlab_ci['max_artifacts_size'] ||= 100
+Settings.gitlab_ci['max_artifacts_size'] ||= 100 # in megabytes
#
# Reply by email
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 11065fee012..5d35d1da4ee 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -286,7 +286,7 @@ artifacts:
The artifacts will be send after the build success to GitLab and will be accessible in GitLab interface to download.
-This feature requires GitLab Runner v 0.7.0.
+This feature requires GitLab Runner v0.7.0 or higher.
## Validate the .gitlab-ci.yml
Each instance of GitLab CI has an embedded debug tool called Lint.
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index dab0df12635..0a586672807 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -69,7 +69,7 @@ module Ci
end
status 200
- { temp_path: ArtifactUploader.artifacts_upload_path }
+ { TempPath: ArtifactUploader.artifacts_upload_path }
end
# Upload artifacts to build - Runners only