Merge branch 'groups-controller-show-performance' into 'master'

app/finders/group_projects_finder.rb

@@ -39,15 +39,6 @@ class GroupProjectsFinder < ProjectsFinder
   end
 
   def collection_with_user
-    if group.users.include?(current_user)
-      if only_shared?
-        [shared_projects]
-      elsif only_owned?
-        [owned_projects]
-      else
-        [shared_projects, owned_projects]
-      end
-    else
     if only_shared?
       [shared_projects.public_or_visible_to_user(current_user)]
     elsif only_owned?
@@ -59,7 +50,6 @@ class GroupProjectsFinder < ProjectsFinder
       ]
     end
   end
-  end
 
   def collection_without_user
     if only_shared?

changelogs/unreleased/groups-controller-show-performance.yml

+---
+title: Improve performance of GroupsController#show
+merge_request:
+author:
+type: performance

db/migrate/20180524132016_merge_requests_target_id_iid_state_partial_index.rb

+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class MergeRequestsTargetIdIidStatePartialIndex < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  INDEX_NAME = 'index_merge_requests_on_target_project_id_and_iid_opened'
+
+  disable_ddl_transaction!
+
+  def up
+    # On GitLab.com this index will take up roughly 5 MB of space.
+    add_concurrent_index(
+      :merge_requests,
+      [:target_project_id, :iid],
+      where: "state = 'opened'",
+      name: INDEX_NAME
+    )
+  end
+
+  def down
+    remove_concurrent_index_by_name(:merge_requests, INDEX_NAME)
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180521171529) do
+ActiveRecord::Schema.define(version: 20180524132016) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1232,6 +1232,7 @@ ActiveRecord::Schema.define(version: 20180521171529) do
   add_index "merge_requests", ["source_project_id", "source_branch"], name: "index_merge_requests_on_source_project_id_and_source_branch", using: :btree
   add_index "merge_requests", ["target_branch"], name: "index_merge_requests_on_target_branch", using: :btree
   add_index "merge_requests", ["target_project_id", "iid"], name: "index_merge_requests_on_target_project_id_and_iid", unique: true, using: :btree
+  add_index "merge_requests", ["target_project_id", "iid"], name: "index_merge_requests_on_target_project_id_and_iid_opened", where: "((state)::text = 'opened'::text)", using: :btree
   add_index "merge_requests", ["target_project_id", "merge_commit_sha", "id"], name: "index_merge_requests_on_tp_id_and_merge_commit_sha_and_id", using: :btree
   add_index "merge_requests", ["title"], name: "index_merge_requests_on_title", using: :btree
   add_index "merge_requests", ["title"], name: "index_merge_requests_on_title_trigram", using: :gin, opclasses: {"title"=>"gin_trgm_ops"}

lib/banzai/reference_parser/issue_parser.rb

@@ -69,7 +69,8 @@ module Banzai
                 { group: [:owners, :group_members] },
                 :invited_groups,
                 :project_members,
-                :project_feature
+                :project_feature,
+                :route
               ]
             }
           ),