Commit bb1a023d authored by Nick Thomas's avatar Nick Thomas

Merge branch...

Merge branch '20782-controller-action-projects-networkcontroller-show-executes-more-than-100-sql-queries' into 'master'

Resolve "Controller action Projects::NetworkController#show executes more than 100 SQL queries"

See merge request gitlab-org/gitlab!58635
parents bf7589ad 96cf2595
...@@ -4,7 +4,6 @@ class Projects::NetworkController < Projects::ApplicationController ...@@ -4,7 +4,6 @@ class Projects::NetworkController < Projects::ApplicationController
include ExtractsPath include ExtractsPath
include ApplicationHelper include ApplicationHelper
before_action :disable_query_limiting
before_action :require_non_empty_project before_action :require_non_empty_project
before_action :assign_ref_vars before_action :assign_ref_vars
before_action :authorize_download_code! before_action :authorize_download_code!
...@@ -41,8 +40,4 @@ class Projects::NetworkController < Projects::ApplicationController ...@@ -41,8 +40,4 @@ class Projects::NetworkController < Projects::ApplicationController
@commit = @repo.commit(@options[:extended_sha1]) @commit = @repo.commit(@options[:extended_sha1])
end end
def disable_query_limiting
Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/20782')
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment