Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 21 deletions

diff --git a/lib/banzai/reference_parser/commit_parser.rb b/lib/banzai/reference_parser/commit_parser.rb
index 8ddb2bb8815..7c2bccc68d9 100644
--- a/lib/banzai/reference_parser/commit_parser.rb
+++ b/lib/banzai/reference_parser/commit_parser.rb
@@ -21,24 +21,6 @@ module Banzai
       end
 
       def find_commits(project, ids)
-        return limited_commits(project, ids) if Feature.enabled?(:limited_commit_parser, project)
-
-        commits = []
-
-        return commits unless project.valid_repo?
-
-        ids.each do |id|
-          commit = project.commit(id)
-
-          commits << commit if commit
-        end
-
-        commits
-      end
-
-      private
-
-      def limited_commits(project, ids)
         return [] unless project.valid_repo?
 
         ids = ids.take(COMMITS_LIMIT)
@@ -46,6 +28,8 @@ module Banzai
         project.commits_by(oids: ids)
       end
 
+      private
+
       def can_read_reference?(user, ref_project, node)
         can?(user, :download_code, ref_project)
       end
diff --git a/lib/gitlab/github_import/clients/search_repos.rb b/lib/gitlab/github_import/clients/search_repos.rb
index 5e058fc0933..a2ef6ca24eb 100644
--- a/lib/gitlab/github_import/clients/search_repos.rb
+++ b/lib/gitlab/github_import/clients/search_repos.rb
@@ -53,7 +53,7 @@ module Gitlab
         end
 
         def search_repos_query(string, options = {})
-          base = "#{string} in:name is:public,private"
+          base = "#{string} in:name is:public,private fork:true"
 
           case options[:relation_type]
           when 'organization' then organization_repos_query(base, options)
diff --git a/lib/sidebars/projects/menus/merge_requests_menu.rb b/lib/sidebars/projects/menus/merge_requests_menu.rb
index be80a58d5f1..71cc53da3ea 100644
--- a/lib/sidebars/projects/menus/merge_requests_menu.rb
+++ b/lib/sidebars/projects/menus/merge_requests_menu.rb
@@ -60,9 +60,9 @@ module Sidebars
         override :active_routes
         def active_routes
           if context.project.issues_enabled?
-            { controller: 'projects/merge_requests' }
+            { controller: ['projects/merge_requests', :conflicts] }
           else
-            { controller: ['projects/merge_requests', :milestones] }
+            { controller: ['projects/merge_requests', :milestones, :conflicts] }
           end
         end