Add latest changes from gitlab-org/gitlab@master

7 files changed, 59 insertions, 9 deletions

diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md
index 7a3d116ea58..99f4033e8fd 100644
--- a/doc/administration/job_artifacts.md
+++ b/doc/administration/job_artifacts.md
@@ -403,13 +403,13 @@ If you need to manually remove ALL job artifacts associated with multiple jobs,
 
    ```ruby
    project = Project.find_by_full_path('path/to/project')
-   builds_with_artifacts =  project.builds.with_existing_job_artifacts
+   builds_with_artifacts =  project.builds.with_existing_job_artifacts(Ci::JobArtifact.trace)
    ```
 
    To select jobs with artifacts across the entire GitLab instance:
 
    ```ruby
-   builds_with_artifacts = Ci::Build.with_existing_job_artifacts
+   builds_with_artifacts = Ci::Build.with_existing_job_artifacts(Ci::JobArtifact.trace)
    ```
 
 1. Select the user which will be mentioned in the web UI as erasing the job:
diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
index 0ab8d629b61..baadc2c6c56 100644
--- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
+++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
@@ -895,6 +895,42 @@ loop do
 end
 ```
 
+## Registry
+
+### Registry Disk Space Usage by Project
+
+As a GitLab administrator, you may need to reduce disk space consumption.
+A common culprit is Docker Registry images that are no longer in use. To find
+the storage broken down by each project, run the following in the
+GitLab Rails console:
+
+```ruby
+projects_and_size = []
+# a list of projects you want to look at, can get these however
+projects = Project.last(100)
+
+projects.each do |p|
+   project_total_size = 0
+   container_repositories = p.container_repositories
+
+   container_repositories.each do |c|
+       c.tags.each do |t|
+          project_total_size = project_total_size + t.total_size
+       end
+   end
+
+   if project_total_size > 0
+      projects_and_size << [p.full_path,project_total_size]
+   end
+end
+
+# projects_and_size is filled out now
+# maybe print it as comma separated output?
+projects_and_size.each do |ps|
+   puts "%s,%s" % ps
+end
+```
+
 ## Sidekiq
 
 ### Size of a queue
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 8cfba68acee..da3dec9cd62 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -300,6 +300,15 @@ You can filter by [custom attributes](custom_attributes.md) with:
 GET /projects?custom_attributes[key]=value&custom_attributes[other_key]=other_value
 ```
 
+### Pagination limits
+
+From GitLab 12.10, [offset-based pagination](README.md#offset-based-pagination) will be
+[limited to 10,000 records](https://gitlab.com/gitlab-org/gitlab/issues/34565).
+[Keyset pagination](README.md#keyset-based-pagination) will be required to retrieve projects
+beyond this limit.
+
+Note that keyset pagination only supports `order_by=id`. Other sorting options are not available.
+
 ## List user projects
 
 Get a list of visible projects owned by the given user. When accessed without authentication, only public projects are returned.
diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md
index 55710145a95..43cc7eeab8c 100644
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
@@ -5,7 +5,7 @@ type: reference
 # Getting started with GitLab CI/CD
 
 NOTE: **Note:**
-Starting from version 8.0, GitLab [Continuous Integration][ci] (CI)
+Starting from version 8.0, GitLab [Continuous Integration](https://about.gitlab.com/product/continuous-integration/) (CI)
 is fully integrated into GitLab itself and is [enabled] by default on all
 projects.
 
diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md
index c7c59a72e9c..407633c24df 100644
--- a/doc/development/documentation/styleguide.md
+++ b/doc/development/documentation/styleguide.md
@@ -766,6 +766,7 @@ nicely on different mobile devices.
 - To display raw Markdown instead of rendered Markdown, you can use triple backticks
   with `md`, like the `Markdown code` example above, unless you want to include triple
   backticks in the code block as well. In that case, use triple tildes (`~~~`) instead.
+- [Syntax highlighting for code blocks](https://github.com/rouge-ruby/rouge/wiki/List-of-supported-languages-and-lexers) is available for many languages.
 - For a complete reference on code blocks, check the [Kramdown guide](https://about.gitlab.com/handbook/product/technical-writing/markdown-guide/#code-blocks).
 
 ## Alert boxes
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index ce1c23f77af..aa8e29637cc 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -547,10 +547,9 @@ GitLab will sign the request with the provided private key. GitLab will include
 
 ### GitLab+SAML Testing Environments
 
-If you need to troubleshoot, below is a complete GitLab+SAML testing environment using docker compose:
-https://gitlab.com/gitlab-com/support/toolbox/replication/tree/master/compose_files
+If you need to troubleshoot, [a complete GitLab+SAML testing environment using Docker compose](https://gitlab.com/gitlab-com/support/toolbox/replication/tree/master/compose_files) is available.
 
-If you only need a SAML provider for testing, below is quick start guide to start a Docker container with a plug and play SAML 2.0 Identity Provider (IdP): https://docs.gitlab.com/ee/administration/troubleshooting/test_environments.html#saml
+If you only need a SAML provider for testing, a [quick start guide to start a Docker container](../administration/troubleshooting/test_environments.html#saml) with a plug and play SAML 2.0 Identity Provider (IdP) is available.
 
 ### 500 error after login
 
diff --git a/doc/user/group/epics/index.md b/doc/user/group/epics/index.md
index d8cb49d0e9f..7f9270785db 100644
--- a/doc/user/group/epics/index.md
+++ b/doc/user/group/epics/index.md
@@ -118,10 +118,13 @@ To remove a child epic from a parent epic:
 To set a **Start date** and **Due date** for an epic, select one of the following:
 
 - **Fixed**: Enter a fixed value.
-- **From milestones**: Inherit a dynamic value from the issues added to the epic.
-- **Inherited**: Inherit a dynamic value from the issues added to the epic. ([Introduced](https://gitlab.com/gitlab-org/gitlab/issues/7332) in GitLab 12.5 to replace **From milestones**).
+- **From milestones**: Inherit a dynamic value from the milestones currently assigned to the epic's issues.
+  Note that GitLab 12.5 replaced this option with **Inherited**.
+- **Inherited**: Inherit a dynamic value from the epic's issues, child epics, and milestones ([Introduced](https://gitlab.com/gitlab-org/gitlab/issues/7332) in GitLab 12.5 to replace **From milestones**).
 
-### Milestones
+### From milestones
+
+> [Replaced](https://gitlab.com/gitlab-org/gitlab/issues/7332) in GitLab 12.5 by **Inherited**.
 
 If you select **From milestones** for the start date, GitLab will automatically set the date to be earliest
 start date across all milestones that are currently assigned to the issues that are added to the epic.
@@ -136,6 +139,8 @@ These are dynamic dates which are recalculated if any of the following occur:
 
 ### Inherited
 
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/7332) in GitLab 12.5 to replace **From milestones**.
+
 If you select **Inherited** for the start date, GitLab will scan all child epics and issues assigned to the epic,
 and will set the start date to match the earliest found start date or milestone. Similarly, if you select
 **Inherited** for the due date, GitLab will set the due date to match the latest due date or milestone