Merge branch 'doc/repo-restrictions-refactor' into 'master'

Refactor repo restrictions docs



See merge request !750

app/views/admin/application_settings/_form.html.haml

@@ -100,10 +100,13 @@
       .col-sm-10
         = f.number_field :max_attachment_size, class: 'form-control'
     .form-group
-      = f.label :repository_size_limit, 'Per repository size limit (MB)', class: 'control-label col-sm-2'
+      = f.label :repository_size_limit, class: 'control-label col-sm-2' do
+        Size limit per repository (MB)
       .col-sm-10
         = f.number_field :repository_size_limit, class: 'form-control', min: 0
-        %span.help-block#repository_size_limit_help_block Includes LFS objects. It can be overridden per group, or per project. 0 for unlimited
+        %span.help-block#repository_size_limit_help_block
+          Includes LFS objects. It can be overridden per group, or per project. 0 for unlimited.
+          = link_to icon('question-circle'), help_page_path("user/admin_area/settings/account_and_limit_settings")
     .form-group
       = f.label :session_expire_delay, 'Session duration (minutes)', class: 'control-label col-sm-2'
       .col-sm-10

doc/administration/repository_restrictions.md → doc/user/admin_area/settings/account_and_limit_settings.md

-# Repository size restrictions
+# Account and limit settings
 
-> Introduced with GitLab Enterprise Edition 8.12
+## Repository size limit
 
-Repositories within your GitLab instance can grow quickly, specially if you are
+> [Introduced][ee-740] in GitLab Enterprise Edition 8.12.
+
+Repositories within your GitLab instance can grow quickly, especially if you are
 using LFS. Their size can grow exponentially and eat up your storage device quite
 quickly.
 
-In order to avoid this from happening, you can set a hard limit for your repositories.
-You can set this limit globally, per group, or per project, with per project limits
-taking the highest priority.
+In order to avoid this from happening, you can set a hard limit for your
+repositories' size. This limit can be set globally, per group, or per project,
+with per project limits taking the highest priority.
 
-These settings can be found within each project, or group settings and within
-the Application Settings for the global value.
+Only a GitLab administrator can set those limits. Setting the limit to `0` means
+there are no restrictions.
 
-Setting the limit to `0` means there is no restrictions.
+These settings can be found within each project's settings, in a group's
+settings and in the Application Settings area for the global value
+(`/admin/application_settings`).
 
-# Restrictions
+### Repository size restrictions
 
 When a project has reached its size limit, you will not be able to push to it,
-create new merge request, or merge existing ones. You will still be able to create
-new issues, and clone the project.
+create a new merge request, or merge existing ones. You will still be able to
+create new issues, and clone the project though.
 
 Uploading LFS objects will also be denied.
 
 In order to lift these restrictions, the administrator of the GitLab instance
 needs to increase the limit on the particular project that exceeded it.
 
-
-# Limitations
+### Current limitations for the repository size check
 
 The first push of a new project cannot be checked for size as of now, so the first
 push will allow you to upload more than the limit dictates, but every subsequent
 push will be denied.
 
 LFS objects, however, can be checked on first push and **will** be rejected if the
-sum of their sizes exceeds the maximum allowed repository size.
\ No newline at end of file
+sum of their sizes exceeds the maximum allowed repository size.
+
+[ee-740]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/740