Add latest changes from gitlab-org/gitlab@master

doc/api/merge_request_approvals.md

@@ -956,7 +956,7 @@ POST /projects/:id/merge_requests/:merge_request_iid/approve
 | `id`                | integer | yes      | The ID of a project     |
 | `merge_request_iid` | integer | yes      | The IID of MR           |
 | `sha`               | string  | no       | The HEAD of the MR      |
-| `approval_password` **(STARTER)** | string  | no      | Current user's password. Required if [**Require user password to approve**](../user/project/merge_requests/merge_request_approvals.md#require-authentication-when-approving-a-merge-request-starter) is enabled in the project settings. |
+| `approval_password` **(STARTER)** | string  | no      | Current user's password. Required if [**Require user password to approve**](../user/project/merge_requests/merge_request_approvals.md#require-authentication-when-approving-a-merge-request) is enabled in the project settings. |
 The `sha` parameter works in the same way as
 when [accepting a merge request](merge_requests.md#accept-mr): if it is passed, then it must

doc/development/background_migrations.md

@@ -59,8 +59,7 @@ integrity is guaranteed.
 ## Background migrations for EE-only features
 All the background migration classes for EE-only features should be present in GitLab CE.
-For this purpose, an empty class can be created for GitLab CE and for GitLab EE it can be extended
-For this purpose, an empty class can be created for GitLab CE,  and it can be extended for GitLab EE
+For this purpose, an empty class can be created for GitLab CE, and it can be extended for GitLab EE
 as explained in the [guidelines for implementing Enterprise Edition features](ee_features.md#code-in-libgitlabbackground_migration).
 ## How It Works

doc/user/application_security/index.md

@@ -148,12 +148,15 @@ Clicking on this button will create a merge request to apply the solution onto t
 ![Create merge request from vulnerability](img/create_issue_with_list_hover.png)
-## Security approvals in merge requests **(ULTIMATE)**
+## Security approvals in merge requests
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9928) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.2.
-Merge Request Approvals can be configured to require approval from a member
-of your security team when a vulnerability, or a software license compliance violation would be introduced by a merge request.
+Merge Request Approvals can be configured to require approval from a member of your
+security team when a merge request would introduce one of the following security issues:
+
+- a security vulnerability
+- a software license compliance violation
 This threshold is defined as `high`, `critical`, or `unknown`
 severity. When any vulnerabilities are present within a merge request, an

doc/user/instance_statistics/dev_ops_score.md

@@ -15,7 +15,7 @@ the last 30 days, averaged over the number of active users in that time period.
 provides a Lead score per feature, which is calculated based on GitLab's analysis
 of top-performing instances based on [usage ping data](../admin_area/settings/usage_statistics.md#usage-ping-core-only) that GitLab has
 collected. Your score is compared to the lead score of each feature and then expressed as a percentage at the bottom of said feature.
-Your overall index score is an average of all your feature score percentages - this percentage value is presented above all the of features on the page.
+Your overall **index score** is an average of your feature scores. You can use this score to compare your DevOps status to other organizations.
 ![DevOps Score](img/dev_ops_score_v12_6.png)

doc/user/project/code_owners.md

@@ -33,7 +33,7 @@ the given file.
 Once you've set Code Owners to a project, you can configure it to
 receive approvals:
-- As [merge request eligible approvers](merge_requests/merge_request_approvals.md#code-owners-as-eligible-approvers-starter). **(STARTER)**
+- As [merge request eligible approvers](merge_requests/merge_request_approvals.md#code-owners-as-eligible-approvers).
 - As required approvers for [protected branches](protected_branches.md#protected-branches-approval-by-code-owners-premium). **(PREMIUM)**
 Once set, Code Owners are displayed in merge requests widgets:

doc/user/search/index.md

@@ -73,6 +73,15 @@ You can filter issues and merge requests by specific terms included in titles or
 ![filter issues by specific terms](img/issue_search_by_term.png)
+### Filtering merge requests by approvers **(STARTER)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/9468) in [GitLab Starter](https://about.gitlab.com/pricing/) 11.9.
+
+To filter merge requests by an individual approver, you can type (or select from
+the dropdown) `approver` and select the user.
+
+![Filter MRs by an approver](img/filter_approver_merge_requests.png)
+
 ## Search history
 You can view recent searches by clicking on the little arrow-clock icon, which is to the left of the search input. Click the search entry to run that search again. This feature is available for issues and merge requests. Searches are stored locally in your browser.

qa/qa/resource/project_milestone.rb

@@ -3,33 +3,14 @@
 module QA
   module Resource
     class ProjectMilestone < Base
-      attr_reader :title
-      attr_accessor :description
+      attribute :title
       attribute :project do
         Project.fabricate!
       end
-      def title=(title)
-        @title = "#{title}-#{SecureRandom.hex(4)}"
-        @description = 'A milestone'
-      end
-
-      def fabricate!
-        project.visit!
-
-        Page::Project::Menu.perform do |menu|
-          menu.click_issues
-          menu.click_milestones
-        end
-
-        Page::Project::Milestone::Index.perform(&:click_new_milestone)
-
-        Page::Project::Milestone::New.perform do |milestone_new|
-          milestone_new.set_title(@title)
-          milestone_new.set_description(@description)
-          milestone_new.click_milestone_create_button
-        end
+      def initialize
+        @title = "project-milestone-#{SecureRandom.hex(4)}"
       end
       def api_get_path
@@ -42,8 +23,7 @@ module QA
       def api_post_body
         {
-          description: @description,
-          title: @title
+          title: title
         }
       end
     end

qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb

@@ -32,7 +32,6 @@ module QA
         milestone = Resource::ProjectMilestone.fabricate_via_api! do |milestone|
           milestone.project = @project
-          milestone.title = 'milestone'
         end
         label = Resource::Label.fabricate_via_api! do |label|