Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
e2b5788052
commit
4656fe08b9
|
@ -74,6 +74,16 @@ export default {
|
||||||
required: false,
|
required: false,
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
|
autoCompleteEpics: {
|
||||||
|
type: Boolean,
|
||||||
|
required: false,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
autoCompleteIssues: {
|
||||||
|
type: Boolean,
|
||||||
|
required: false,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
@ -177,7 +187,7 @@ export default {
|
||||||
:path-id-separator="pathIdSeparator"
|
:path-id-separator="pathIdSeparator"
|
||||||
:input-value="inputValue"
|
:input-value="inputValue"
|
||||||
:auto-complete-sources="transformedAutocompleteSources"
|
:auto-complete-sources="transformedAutocompleteSources"
|
||||||
:auto-complete-options="{ issues: true, epics: true }"
|
:auto-complete-options="{ issues: autoCompleteIssues, epics: autoCompleteEpics }"
|
||||||
:issuable-type="issuableType"
|
:issuable-type="issuableType"
|
||||||
@pendingIssuableRemoveRequest="onPendingIssuableRemoveRequest"
|
@pendingIssuableRemoveRequest="onPendingIssuableRemoveRequest"
|
||||||
@formCancel="onFormCancel"
|
@formCancel="onFormCancel"
|
||||||
|
|
|
@ -41,13 +41,15 @@ RSpec.describe Projects::DestroyService, :aggregate_failures do
|
||||||
let!(:pending_state) { create(:ci_build_pending_state, build: build) }
|
let!(:pending_state) { create(:ci_build_pending_state, build: build) }
|
||||||
|
|
||||||
it 'deletes build related records' do
|
it 'deletes build related records' do
|
||||||
expect { destroy_project(project, user, {}) }.to change { Ci::Build.count }.by(-1)
|
expect { destroy_project(project, user, {}) }
|
||||||
|
.to change { Ci::Build.count }.by(-1)
|
||||||
.and change { Ci::BuildTraceChunk.count }.by(-1)
|
.and change { Ci::BuildTraceChunk.count }.by(-1)
|
||||||
.and change { Ci::JobArtifact.count }.by(-2)
|
.and change { Ci::JobArtifact.count }.by(-2)
|
||||||
.and change { Ci::JobVariable.count }.by(-1)
|
.and change { Ci::JobVariable.count }.by(-1)
|
||||||
.and change { Ci::BuildPendingState.count }.by(-1)
|
.and change { Ci::BuildPendingState.count }.by(-1)
|
||||||
.and change { Ci::BuildReportResult.count }.by(-1)
|
.and change { Ci::BuildReportResult.count }.by(-1)
|
||||||
.and change { Ci::BuildRunnerSession.count }.by(-1)
|
.and change { Ci::BuildRunnerSession.count }.by(-1)
|
||||||
|
.and change { Ci::Pipeline.count }.by(-1)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'avoids N+1 queries', skip: 'skipped until fixed in https://gitlab.com/gitlab-org/gitlab/-/issues/24644' do
|
it 'avoids N+1 queries', skip: 'skipped until fixed in https://gitlab.com/gitlab-org/gitlab/-/issues/24644' do
|
||||||
|
|
Loading…
Reference in New Issue