Add extra MWBS found after the merge

doc/api/merge_requests.md

@@ -489,7 +489,7 @@ Parameters:
 | `merge_request_id` | integer | yes | The ID of the merge request |
 | `merge_commit_message` | string | no | Custom merge commit message |
 | `should_remove_source_branch` | boolean | no | Remove the source branch after merge |
-| `merge_when_build_succeeds` | boolean | no | Merge when build succeeds, rather than immediately |
+| `merge_when_pipeline_succeeds` | boolean | no | Merge when pipeline succeeds, rather than immediately |
 | `sha` | string | no  | If present, then this SHA must match the HEAD of the source branch, otherwise the merge will fail |
 | `squash` | boolean | no | Squash the merge request into a single commit |
 

doc/integration/jenkins.md

@@ -32,7 +32,7 @@ Create a user or choose an existing user that Jenkins will use to interact
 through the GitLab API. This user will need to be a global Admin or added
 as a member to each Group/Project. Developer permission is required for reporting
 build status. This is because a successful build status can trigger a merge
-when 'Merge when build succeeds' feature is used. Some features of the GitLab
+when 'Merge when pipeline succeeds' feature is used. Some features of the GitLab
 Plugin may require additional privileges. For example, there is an option to
 accept a merge request if the build is successful. Using this feature would
 require developer, master or owner-level permission.

lib/api/v3/merge_requests.rb

@@ -179,7 +179,7 @@ module API
             optional :should_remove_source_branch, type: Boolean,
                                                    desc: 'When true, the source branch will be deleted if possible'
             optional :merge_when_build_succeeds, type: Boolean,
-                                                 desc: 'When true, this merge request will be merged when the build succeeds'
+                                                 desc: 'When true, this merge request will be merged when the pipeline succeeds'
             optional :sha, type: String, desc: 'When present, must have the HEAD SHA of the source branch'
             optional :squash, type: Boolean, desc: 'When true, the commits will be squashed into a single commit on merge'
           end
@@ -220,7 +220,7 @@ module API
             present merge_request, with: ::API::V3::Entities::MergeRequest, current_user: current_user, project: user_project
           end
 
-          desc 'Cancel merge if "Merge When Build succeeds" is enabled' do
+          desc 'Cancel merge if "Merge When Pipeline succeeds" is enabled' do
             success ::API::V3::Entities::MergeRequest
           end
           post "#{path}/cancel_merge_when_build_succeeds" do

spec/requests/api/projects_spec.rb

@@ -556,7 +556,7 @@ describe API::Projects, api: true  do
         expect(json_response['shared_with_groups'][0]['group_id']).to eq(group.id)
         expect(json_response['shared_with_groups'][0]['group_name']).to eq(group.name)
         expect(json_response['shared_with_groups'][0]['group_access_level']).to eq(link.group_access)
-        expect(json_response['only_allow_merge_if_build_succeeds']).to eq(project.only_allow_merge_if_build_succeeds)
+        expect(json_response['only_allow_merge_if_pipeline_succeeds']).to eq(project.only_allow_merge_if_pipeline_succeeds)
         expect(json_response['only_allow_merge_if_all_discussions_are_resolved']).to eq(project.only_allow_merge_if_all_discussions_are_resolved)
         expect(json_response['repository_storage']).to eq(project.repository_storage)
       end

spec/services/create_deployment_service_spec.rb

@@ -221,7 +221,7 @@ describe CreateDeploymentService, services: true do
         { environment: { name: 'production', url: 'http://gitlab.com' } }
       end
 
-      context 'when build succeeds' do
+      context 'when pipeline succeeds' do
         it_behaves_like 'does create environment and deployment' do
           let(:deployable) { build }