diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-16 18:49:07 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-16 18:49:07 +0800 |
| commit | 4789fe25fd84e6ec01592728d5c1b28862eec7cf (patch) | |
| tree | 385faa65a37b1206175d8db2be0cdf9d67cddfb3 /doc/user/admin_area | |
| parent | b72f00c7cfdc854640cbb118c741a116ae4fd8ba (diff) | |
| parent | 1b6a671eb5c9b4a440a07e56aad8e30b1dfe852f (diff) | |
| download | gitlab-ce-4789fe25fd84e6ec01592728d5c1b28862eec7cf.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration
* upstream/master: (37 commits)
Show merge errors in merge request widget
Clarify that stage is needed to stop environments
Fix broken link in university docs
allow clicking on text or icon to trigger expand
style links on system notes to look clickable
Clean up terms used for issues. Use New instead of Add.
Fix most of broken docs links
Set `Auto-Submitted: auto-generated` header to emails
Fix Rubocop offense
Fix regression where cmd-click stopped working for todos and merge request tabs
Remove changelog entries for 8.16.5 release
Merge branch 'fix-github-import-MR-wrong-project' into 'security'
Merge branch 'svg-xss-fix' into 'security'
Merge branch 'fix-rdoc-xss' into 'security'
Merge branch 'asciidoctor-xss-patch' into 'security'
Specify that only project owners can transfer a project
only load istanbul plugin in development mode
Make Karma output look nicer for CI (!9165)
Centers loading icon vertically and horizontally in pipelines table in commit view
Rename builds to jobs in docs
...
Diffstat (limited to 'doc/user/admin_area')
| -rw-r--r-- | doc/user/admin_area/settings/continuous_integration.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index 295e0adec45..81247786173 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -2,9 +2,9 @@ ## Maximum artifacts size -The maximum size of the [build artifacts][art-yml] can be set in the Admin -area of your GitLab instance. The value is in *MB* and the default is 100MB. -Note that this setting is set for each job. +The maximum size of the [job artifacts][art-yml] can be set in the Admin area +of your GitLab instance. The value is in *MB* and the default is 100MB. Note +that this setting is set for each job. 1. Go to **Admin area > Settings** (`/admin/application_settings`). @@ -35,5 +35,5 @@ this setting is set for each job. Leave it blank for no default expiration. 1. Hit **Save** for the changes to take effect. -[art-yml]: ../../../administration/build_artifacts +[art-yml]: ../../../administration/job_artifacts [duration-syntax]: ../../../ci/yaml/README#artifactsexpire_in |