Add latest changes from gitlab-org/gitlab@master

3 files changed, 12 insertions, 3 deletions

diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb
index cc807098498..887a5ba598f 100644
--- a/spec/controllers/projects/blob_controller_spec.rb
+++ b/spec/controllers/projects/blob_controller_spec.rb
@@ -352,7 +352,6 @@ RSpec.describe Projects::BlobController do
             project_new_merge_request_path(
               forked_project,
               merge_request: {
-                source_project_id: forked_project.id,
                 target_project_id: project.id,
                 source_branch: "fork-test-1",
                 target_branch: "master"
diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
index a72c98552a5..59b2168c41a 100644
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -378,7 +378,6 @@ RSpec.describe Projects::CommitController do
         project_new_merge_request_path(
           source_project,
           merge_request: {
-            source_project_id: source_project.id,
             target_project_id: project.id,
             source_branch: branch,
             target_branch: 'feature'
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index b4d4e01e972..6922b0f3831 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -410,9 +410,20 @@ RSpec.describe SearchController do
           expect(payload[:metadata]['meta.search.project_ids']).to eq(%w(456 789))
           expect(payload[:metadata]['meta.search.type']).to eq('basic')
           expect(payload[:metadata]['meta.search.level']).to eq('global')
+          expect(payload[:metadata]['meta.search.language']).to eq('ruby')
         end
 
-        get :show, params: { scope: 'issues', search: 'hello world', group_id: '123', project_id: '456', project_ids: %w(456 789), confidential: true, state: true, force_search_results: true }
+        get :show, params: {
+          scope: 'issues',
+          search: 'hello world',
+          group_id: '123',
+          project_id: '456',
+          project_ids: %w(456 789),
+          confidential: true,
+          state: true,
+          force_search_results: true,
+          language: 'ruby'
+        }
       end
 
       it 'appends the default scope in meta.search.scope' do