Automatic merge of gitlab-org/gitlab-ce master

doc/user/admin_area/settings/account_and_limit_settings.md

@@ -44,10 +44,12 @@ The first push of a new project, including LFS objects, will be checked for size
 and **will** be rejected if the sum of their sizes exceeds the maximum allowed 
 repository size.
 
+**Note:** The repository size limit includes repository files and LFS, and does not include artifacts.
+
 For details on manually purging files, see [reducing the repository size using Git](../../project/repository/reducing_the_repo_size_using_git.md).
 
 NOTE: **Note:**
-For GitLab.com, the repository size limit is 10 GB.
+GitLab.com repository size [is set by GitLab](../../gitlab_com/index.md#repository-size-limit).
 
 <!-- ## Troubleshooting
 

doc/user/project/container_registry.md

@@ -29,7 +29,7 @@ to enable it.
    following the [administration documentation](../../administration/container_registry.md).
    If you are using GitLab.com, this is enabled by default so you can start using
    the Registry immediately. Currently there is a soft (10GB) size restriction for
-   registry on GitLab.com, as part of the [repository size limit](repository/index.html#repository-size).
+   registry on GitLab.com, as part of the [repository size limit](repository/index.md).
 1. Go to your [project's General settings](settings/index.md#sharing-and-permissions)
    and enable the **Container Registry** feature on your project. For new
    projects this might be enabled by default. For existing projects

doc/user/project/repository/index.md

@@ -171,17 +171,14 @@ Via command line, you can commit multiple times before pushing.
 - **Sign a commit:**
   Use GPG to [sign your commits](gpg_signed_commits/index.md).
 
-## Repository size
+## Project and repository size
 
-A project's repository size is reported on the project's **Details** page. The reported size is
-updated every 15 minutes at most, so may not reflect recent activity.
+A project's size is reported on the project's **Details** page. The reported size is
+updated every 15 minutes at most, so may not reflect recent activity. The displayed files size includes repository files, artifacts, and LFS.
 
-The repository size for:
+The project size may differ slightly from one instance to another due to compression, housekeeping, and other factors.
 
-- GitLab.com [is set by GitLab](../../gitlab_com/index.md#repository-size-limit).
-- Self-managed instances is set by your GitLab administrators.
-
-You can [reduce a repository's size using Git](reducing_the_repo_size_using_git.md).
+[Repository size limit](../../admin_area/settings/account_and_limit_settings.md) may be set by admins. GitLab.com's repository size limit [is set by GitLab](../../gitlab_com/index.md#repository-size-limit).
 
 ## Contributors