Skip to content
Snippets Groups Projects
Verified Commit d4bf9301 authored by Javiera Tapia's avatar Javiera Tapia :two: Committed by GitLab
Browse files

Merge branch 'revert-2fe6f40c' into 'master'

Revert "Projects::Settings::RepositoryController#show: re-enable query limit"

See merge request !170458



Merged-by: default avatarJaviera Tapia <jtapia@gitlab.com>
Approved-by: default avatarJaviera Tapia <jtapia@gitlab.com>
Approved-by: default avatarJoe Woodward <jwoodward@gitlab.com>
Co-authored-by: Vasilii Iakliushin's avatarVasilii Iakliushin <viakliushin@gitlab.com>
parents 705acd60 3ea7bea6
No related branches found
No related tags found
1 merge request!170458Revert "Projects::Settings::RepositoryController#show: re-enable query limit"
Pipeline #1510914219 passed
......@@ -19,6 +19,7 @@ class RepositoryController < Projects::ApplicationController
urgency :low, [:show, :create_deploy_token]
def show
Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/482942')
render_show
end
......
......@@ -46,8 +46,6 @@
expect(control.log).to include(/SELECT "protected_branch_push_access_levels"/).once
expect(control.log).to include(/SELECT "protected_tag_create_access_levels"/).once
expect(control).not_to exceed_query_limit(82)
expect(response).to have_gitlab_http_status(:ok)
expect(response).to render_template(:show)
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment