Add latest changes from gitlab-org/gitlab@master

doc/administration/instance_limits.md

@@ -383,6 +383,20 @@ Plan.default.actual_limits.update!(ci_active_jobs: 500)
 
 Set the limit to `0` to disable it.
 
+### Maximum time jobs can run
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16777) in GitLab 12.3.
+
+The default maximum time that jobs can run for is 60 minutes. Jobs that run for
+more than 60 minutes time out.
+
+You can change the maximum time a job can run before it times out:
+
+- At the project-level in the [project's CI/CD settings](../ci/pipelines/settings.md#set-a-limit-for-how-long-jobs-can-run)
+  for a given project. This limit must be between 10 minutes and 1 month.
+- At the [runner level](../ci/runners/configure_runners.md#set-maximum-job-timeout-for-a-runner).
+  This limit must be 10 minutes or longer.
+
 ### Maximum number of deployment jobs in a pipeline
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46931) in GitLab 13.7.

lib/gitlab/ci/templates/C++.gitlab-ci.yml

@@ -4,7 +4,7 @@
 # https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/C++.gitlab-ci.yml
 
 # use the official gcc image, based on debian
-# can use verions as well, like gcc:5.2
+# can use versions as well, like gcc:5.2
 # see https://hub.docker.com/_/gcc/
 
 image: gcc

spec/features/projects/issues/design_management/user_uploads_designs_spec.rb

@@ -10,8 +10,8 @@ RSpec.describe 'User uploads new design', :js do
   let(:issue) { create(:issue, project: project) }
 
   before do
-    # Cause of raising query limiting threshold https://gitlab.com/gitlab-org/gitlab/-/issues/347334
-    stub_const("Gitlab::QueryLimiting::Transaction::THRESHOLD", 102)
+    # Cause of raising query limiting threshold https://gitlab.com/gitlab-org/gitlab/-/issues/358845
+    stub_const("Gitlab::QueryLimiting::Transaction::THRESHOLD", 106)
 
     sign_in(user)
     enable_design_management(feature_enabled)