summaryrefslogtreecommitdiff
path: root/doc/development/merge_request_performance_guidelines.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-27 03:07:56 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-27 03:07:56 +0000
commit4560c92ab1954cf0416bafc45d1fa671fcacb3c3 (patch)
tree4b70c6b61345b2df075918cab6314d41b46cf80e /doc/development/merge_request_performance_guidelines.md
parent6348b76e4b4dd4e398915c3150c1d02aafa3f13b (diff)
downloadgitlab-ce-4560c92ab1954cf0416bafc45d1fa671fcacb3c3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/merge_request_performance_guidelines.md')
-rw-r--r--doc/development/merge_request_performance_guidelines.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/merge_request_performance_guidelines.md b/doc/development/merge_request_performance_guidelines.md
index d395bf13982..a285d30d7a5 100644
--- a/doc/development/merge_request_performance_guidelines.md
+++ b/doc/development/merge_request_performance_guidelines.md
@@ -377,7 +377,7 @@ Examples:
in service degradation as the system will try to process all schedules
assigned the the project.
-1. GitLab CI includes: We started with the limit of maximum of 50 nested includes.
+1. GitLab CI/CD includes: We started with the limit of maximum of 50 nested includes.
We understood that performance of the feature was acceptable at that level.
We received a request from the community that the limit is too small.
We had a time to understand the customer requirement, and implement an additional