Automatic merge of gitlab-org/gitlab master

app/assets/javascripts/groups_list.js → app/assets/javascripts/groups/groups_list.js

-import FilterableList from './filterable_list';
+import FilterableList from '~/filterable_list';
 
 /**
  * Makes search request for groups when user types a value in the search input.

app/assets/javascripts/create_merge_request_dropdown.js → app/assets/javascripts/issues/create_merge_request_dropdown.js

@@ -3,13 +3,13 @@ import {
   init as initConfidentialMergeRequest,
   isConfidentialIssue,
   canCreateConfidentialMergeRequest,
-} from './confidential_merge_request';
-import confidentialMergeRequestState from './confidential_merge_request/state';
-import DropLab from './filtered_search/droplab/drop_lab_deprecated';
-import ISetter from './filtered_search/droplab/plugins/input_setter';
-import createFlash from './flash';
-import axios from './lib/utils/axios_utils';
-import { __, sprintf } from './locale';
+} from '~/confidential_merge_request';
+import confidentialMergeRequestState from '~/confidential_merge_request/state';
+import DropLab from '~/filtered_search/droplab/drop_lab_deprecated';
+import ISetter from '~/filtered_search/droplab/plugins/input_setter';
+import createFlash from '~/flash';
+import axios from '~/lib/utils/axios_utils';
+import { __, sprintf } from '~/locale';
 
 // Todo: Remove this when fixing issue in input_setter plugin
 const InputSetter = { ...ISetter };

app/assets/javascripts/issues/issue.js

 import $ from 'jquery';
 import { joinPaths } from '~/lib/utils/url_utility';
-import CreateMergeRequestDropdown from '~/create_merge_request_dropdown';
 import createFlash from '~/flash';
 import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants';
 import axios from '~/lib/utils/axios_utils';
 import { addDelimiter } from '~/lib/utils/text_utility';
 import { __ } from '~/locale';
+import CreateMergeRequestDropdown from './create_merge_request_dropdown';
 
 export default class Issue {
   constructor() {

app/assets/javascripts/pages/explore/groups/index.js

-import GroupsList from '~/groups_list';
-import Landing from '~/landing';
-import initGroupsList from '../../../groups';
+import initGroupsList from '~/groups';
+import GroupsList from '~/groups/groups_list';
+import Landing from '~/groups/landing';
 
 function exploreGroups() {
   new GroupsList(); // eslint-disable-line no-new

app/assets/javascripts/pages/groups/edit/index.js

@@ -2,13 +2,13 @@ import { GROUP_BADGE } from '~/badges/constants';
 import dirtySubmitFactory from '~/dirty_submit/dirty_submit_factory';
 import initFilePickers from '~/file_pickers';
 import TransferDropdown from '~/groups/transfer_dropdown';
+import setupTransferEdit from '~/groups/transfer_edit';
 import groupsSelect from '~/groups_select';
 import { initCascadingSettingsLockPopovers } from '~/namespaces/cascading_settings';
 import mountBadgeSettings from '~/pages/shared/mount_badge_settings';
 import projectSelect from '~/project_select';
 import initSearchSettings from '~/search_settings';
 import initSettingsPanels from '~/settings_panels';
-import setupTransferEdit from '~/transfer_edit';
 import initConfirmDanger from '~/init_confirm_danger';
 
 document.addEventListener('DOMContentLoaded', () => {

db/post_migrate/20220106233459_remove_foreign_key_ci_pending_builds_namespace_id.rb

+# frozen_string_literal: true
+
+class RemoveForeignKeyCiPendingBuildsNamespaceId < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  CONSTRAINT_NAME = 'fk_fdc0137e4a'
+
+  def up
+    with_lock_retries do
+      remove_foreign_key_if_exists(:ci_pending_builds, :namespaces, name: CONSTRAINT_NAME)
+    end
+  end
+
+  def down
+    add_concurrent_foreign_key :ci_pending_builds, :namespaces, column: :namespace_id, on_delete: :cascade, name: CONSTRAINT_NAME
+  end
+end

db/schema_migrations/20220106233459

+fc44084057c5fd30f0e7918b4f856a60409f08ad1eb5c3fbc2d8ad5bad7f1ffd
\ No newline at end of file

db/structure.sql

@@ -29884,9 +29884,6 @@ ALTER TABLE ONLY ci_daily_build_group_report_results
 ALTER TABLE ONLY merge_requests
     ADD CONSTRAINT fk_fd82eae0b9 FOREIGN KEY (head_pipeline_id) REFERENCES ci_pipelines(id) ON DELETE SET NULL;
 
-ALTER TABLE ONLY ci_pending_builds
-    ADD CONSTRAINT fk_fdc0137e4a FOREIGN KEY (namespace_id) REFERENCES namespaces(id) ON DELETE CASCADE;
-
 ALTER TABLE ONLY project_import_data
     ADD CONSTRAINT fk_ffb9ee3a10 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 

ee/app/services/issues/build_from_vulnerability_service.rb

@@ -18,7 +18,8 @@ module Issues
 
     def render_description(vulnerability)
       ApplicationController.render(
-        template: 'vulnerabilities/issue_description.md.erb',
+        template: 'vulnerabilities/issue_description',
+        formats: :md,
         locals: { vulnerability: vulnerability.present }
       )
     end

spec/features/issues/user_creates_branch_and_merge_request_spec.rb

@@ -217,7 +217,7 @@ RSpec.describe 'User creates branch and merge request on issue page', :js do
 
       # Javascript debounces AJAX calls.
       # So we have to wait until AJAX requests are started.
-      # Details are in app/assets/javascripts/create_merge_request_dropdown.js
+      # Details are in app/assets/javascripts/issues/create_merge_request_dropdown.js
       # this.refDebounce = _.debounce(...)
       sleep 0.5
 

spec/frontend/landing_spec.js → spec/frontend/groups/landing_spec.js

 import Cookies from 'js-cookie';
-import Landing from '~/landing';
+import Landing from '~/groups/landing';
 
 describe('Landing', () => {
   const test = {};

spec/frontend/transfer_edit_spec.js → spec/frontend/groups/transfer_edit_spec.js

 import $ from 'jquery';
 
 import { loadHTMLFixture } from 'helpers/fixtures';
-import setupTransferEdit from '~/transfer_edit';
+import setupTransferEdit from '~/groups/transfer_edit';
 
 describe('setupTransferEdit', () => {
   const formSelector = '.js-group-transfer-form';

spec/frontend/create_merge_request_dropdown_spec.js → spec/frontend/issues/create_merge_request_dropdown_spec.js

 import MockAdapter from 'axios-mock-adapter';
 import { TEST_HOST } from 'helpers/test_constants';
 import confidentialState from '~/confidential_merge_request/state';
-import CreateMergeRequestDropdown from '~/create_merge_request_dropdown';
+import CreateMergeRequestDropdown from '~/issues/create_merge_request_dropdown';
 import axios from '~/lib/utils/axios_utils';
 
 describe('CreateMergeRequestDropdown', () => {

spec/models/ci/pending_build_spec.rb

@@ -223,4 +223,9 @@ RSpec.describe Ci::PendingBuild do
       end
     end
   end
+
+  it_behaves_like 'cleanup by a loose foreign key' do
+    let!(:parent) { create(:namespace) }
+    let!(:model) { create(:ci_pending_build, namespace: parent) }
+  end
 end