Automatic merge of gitlab-org/gitlab master

doc/development/documentation/feature_flags.md

@@ -67,9 +67,9 @@ When the state of a flag changes (for example, disabled by default to enabled by
 Possible version history entries are:
 
 ```markdown
-> - [Enabled on GitLab.com](issue-link) in GitLab X.X and is ready for production use.
-> - [Enabled on GitLab.com](issue-link) in GitLab X.X and is ready for production use. Available to GitLab.com administrators only.
-> - [Enabled with <flag name> flag](issue-link) for self-managed GitLab in GitLab X.X and is ready for production use.
+> - [Enabled on GitLab.com](issue-link) in GitLab X.X.
+> - [Enabled on GitLab.com](issue-link) in GitLab X.X. Available to GitLab.com administrators only.
+> - [Enabled on self-managed](issue-link) in GitLab X.X.
 > - [Feature flag <flag name> removed](issue-line) in GitLab X.X.
 ```
 
@@ -86,11 +86,11 @@ ask an administrator to [enable the `forti_token_cloud` flag](../administration/
 The feature is not ready for production use.
 ```
 
-If it were to be updated in the future to enable its use in production, you can update the version history:
+When the feature is enabled in production, you can update the version history:
 
 ```markdown
 > - Introduced in GitLab 13.7.
-> - [Enabled with `forti_token_cloud` flag](https://gitlab.com/issue/etc) for self-managed GitLab in GitLab X.X and ready for production use.
+> - [Enabled on self-managed](https://gitlab.com/issue/etc) GitLab 13.8.
 
 FLAG:
 On self-managed GitLab, by default this feature is available. To hide the feature per user,
@@ -101,7 +101,7 @@ And, when the feature is done and fully available to all users:
 
 ```markdown
 > - Introduced in GitLab 13.7.
-> - [Enabled on GitLab.com](https://gitlab.com/issue/etc) in GitLab X.X and is ready for production use.
-> - [Enabled with `forti_token_cloud` flag](https://gitlab.com/issue/etc) for self-managed GitLab in GitLab X.X and is ready for production use.
-> - [Feature flag `forti_token_cloud`](https://gitlab.com/issue/etc) removed in GitLab X.X.
+> - [Enabled on self-managed](https://gitlab.com/issue/etc) GitLab 13.8.
+> - [Enabled on GitLab.com](https://gitlab.com/issue/etc) in GitLab 13.9.
+> - [Feature flag `forti_token_cloud`](https://gitlab.com/issue/etc) removed in GitLab 14.0.
 ```

doc/user/project/merge_requests/index.md

@@ -27,7 +27,7 @@ important parts of the merge request:
 ![Merge request tab positions](img/merge_request_tab_position_v13_11.png)
 
 - **Overview**: Contains the description, notifications from pipelines, and a
-  discussion area for [comment threads](../../discussions/index.md#resolve-a-thread))
+  discussion area for [comment threads](../../discussions/index.md#resolve-a-thread)
   and [code suggestions](reviews/suggestions.md). The right sidebar provides fields
   to add assignees, reviewers, labels, and a milestone to your work, and the
   [merge request widgets area](widgets.md) reports results from pipelines and tests.

qa/qa/specs/features/ee/browser_ui/4_verify/pipelines_for_merged_results_and_merge_trains_spec.rb

@@ -45,7 +45,7 @@ module QA
           merge_request.project = project
           merge_request.description = Faker::Lorem.sentence
           merge_request.target_new_branch = false
-          merge_request.file_name = Faker::Lorem.word
+          merge_request.file_name = Faker::File.unique.file_name
           merge_request.file_content = Faker::Lorem.sentence
         end
       end

scripts/rspec_helpers.sh

@@ -200,7 +200,7 @@ function rspec_matched_foss_tests() {
     echo "This job is intentionally failed because there are more than ${test_file_count_threshold} FOSS test files matched,"
     echo "which would take too long to run in this job."
     echo "To reduce the likelihood of breaking FOSS pipelines,"
-    echo "please add [RUN AS-IF-FOSS] to the MR title and restart the pipeline."
+    echo "please add ~\"pipeline:run-as-if-foss\" label to the merge request and trigger a new pipeline."
     echo "This would run all as-if-foss jobs in this merge request"
     echo "and remove this failing job from the pipeline."
     exit 1