Add latest changes from gitlab-org/gitlab@master

doc/api/project_snippets.md

@@ -123,7 +123,7 @@ Parameters:
 Example request:
 
 ```shell
-curl --request PUT https://gitlab.com/api/v4/projects/:id/snippets \
+curl --request PUT https://gitlab.com/api/v4/projects/:id/snippets/:snippet_id \
      --header "PRIVATE-TOKEN: <your_access_token>" \
      --header "Content-Type: application/json" \
      -d @snippet.json
@@ -157,7 +157,7 @@ Parameters:
 Example request:
 
 ```shell
-curl --request DELETE https://gitlab.com/api/v4/projects/:id/snippets \
+curl --request DELETE https://gitlab.com/api/v4/projects/:id/snippets/:snippet_id \
      --header "PRIVATE-TOKEN: <your_access_token>"
 ```
 

doc/development/README.md

@@ -22,6 +22,7 @@ description: 'Learn how to contribute to GitLab.'
 
 - [Code review guidelines](code_review.md) for reviewing code and having code reviewed
 - [Database review guidelines](database_review.md) for reviewing database-related changes and complex SQL queries, and having them reviewed
+- [Secure coding guidlines](https://gitlab.com/gitlab-com/gl-security/security-guidelines)
 - [Pipelines for the GitLab project](pipelines.md)
 
 Complementary reads:

qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb

@@ -2,7 +2,7 @@
 
 module QA
   context 'Verify' do
-    describe 'Add or Remove CI variable via UI', :smoke do
+    describe 'Add or Remove CI variable via UI', :smoke, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/issues/207915', type: :stale } do
       let!(:project) do
         Resource::Project.fabricate_via_api! do |project|
           project.name = 'project-with-ci-variables'

spec/support/helpers/metrics_dashboard_url_helpers.rb

@@ -9,7 +9,7 @@ module MetricsDashboardUrlHelpers
   end
 
   def clear_host_from_memoized_variables
-    [:metrics_regex, :grafana_regex, :cluster_metrics, :alerts_regex].each do |method_name|
+    [:metrics_regex, :grafana_regex, :clusters_regex, :alert_regex].each do |method_name|
       Gitlab::Metrics::Dashboard::Url.clear_memoization(method_name)
     end
   end