Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
855266b6
Commit
855266b6
authored
Apr 26, 2021
by
Toon Claes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '202423-validate-foreign-key-on-group-hooks' into 'master'"
This reverts merge request !60266
parent
6612b31a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
23 deletions
+2
-23
changelogs/unreleased/202423-validate-foreign-key-on-group-hooks.yml
...unreleased/202423-validate-foreign-key-on-group-hooks.yml
+0
-5
db/migrate/20210426091650_validate_foreign_key_on_group_hooks.rb
...ate/20210426091650_validate_foreign_key_on_group_hooks.rb
+0
-15
db/schema_migrations/20210426091650
db/schema_migrations/20210426091650
+0
-1
db/structure.sql
db/structure.sql
+1
-1
ee/app/models/ee/group.rb
ee/app/models/ee/group.rb
+1
-1
No files found.
changelogs/unreleased/202423-validate-foreign-key-on-group-hooks.yml
deleted
100644 → 0
View file @
6612b31a
---
title
:
Validate foreign key on GroupHooks
merge_request
:
60266
author
:
type
:
other
db/migrate/20210426091650_validate_foreign_key_on_group_hooks.rb
deleted
100644 → 0
View file @
6612b31a
# frozen_string_literal: true
class
ValidateForeignKeyOnGroupHooks
<
ActiveRecord
::
Migration
[
6.0
]
include
Gitlab
::
Database
::
MigrationHelpers
CONSTRAINT_NAME
=
'fk_rails_d35697648e'
def
up
validate_foreign_key
:web_hooks
,
:group_id
,
name:
CONSTRAINT_NAME
end
def
down
# no-op
end
end
db/schema_migrations/20210426091650
deleted
100644 → 0
View file @
6612b31a
e7020e969ea589d4de50bdae7c8c43f52acb1c886d4f9203ff45f631e057d7bc
\ No newline at end of file
db/structure.sql
View file @
855266b6
...
...
@@ -26727,7 +26727,7 @@ ALTER TABLE ONLY pool_repositories
ADD CONSTRAINT fk_rails_d2711daad4 FOREIGN KEY (source_project_id) REFERENCES projects(id) ON DELETE SET NULL;
ALTER TABLE ONLY web_hooks
ADD CONSTRAINT fk_rails_d35697648e FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
ADD CONSTRAINT fk_rails_d35697648e FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE
NOT VALID
;
ALTER TABLE ONLY group_group_links
ADD CONSTRAINT fk_rails_d3a0488427 FOREIGN KEY (shared_group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
ee/app/models/ee/group.rb
View file @
855266b6
...
...
@@ -30,7 +30,7 @@ module EE
has_many
:ldap_group_links
,
foreign_key:
'group_id'
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
has_many
:saml_group_links
,
foreign_key:
'group_id'
has_many
:hooks
,
class_name:
'GroupHook'
has_many
:hooks
,
dependent: :destroy
,
class_name:
'GroupHook'
# rubocop:disable Cop/ActiveRecordDependent
has_many
:allowed_email_domains
,
->
{
order
(
id: :asc
)
},
autosave:
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment