diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-21 09:08:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-21 09:08:41 +0300 |
| commit | 66c3e34b4f4931f613a6ff65435c19e9373c2a6a (patch) | |
| tree | ed8ade5810abde1947fcc0e2b6231c0be82f327d /db | |
| parent | a6ebd13ef8a8b95d7b12a442fdb99b03092e98ba (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20210708202548_add_scanners_column_to_approval_project_rules.rb | 11 | ||||
| -rw-r--r-- | db/schema_migrations/20210708202548 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/db/migrate/20210708202548_add_scanners_column_to_approval_project_rules.rb b/db/migrate/20210708202548_add_scanners_column_to_approval_project_rules.rb new file mode 100644 index 00000000000..a9175833dd7 --- /dev/null +++ b/db/migrate/20210708202548_add_scanners_column_to_approval_project_rules.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AddScannersColumnToApprovalProjectRules < ActiveRecord::Migration[6.1] + def up + add_column :approval_project_rules, :scanners, :text, array: true + end + + def down + remove_column :approval_project_rules, :scanners + end +end diff --git a/db/schema_migrations/20210708202548 b/db/schema_migrations/20210708202548 new file mode 100644 index 00000000000..286bcb07786 --- /dev/null +++ b/db/schema_migrations/20210708202548 @@ -0,0 +1 @@ +e2d7e54330f586bf31d953455b2ebac1fc9b6b24058a1cc7b277bc819ebf232a
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index da2d4c50068..66030b89905 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9669,7 +9669,8 @@ CREATE TABLE approval_project_rules ( project_id integer NOT NULL, approvals_required smallint DEFAULT 0 NOT NULL, name character varying NOT NULL, - rule_type smallint DEFAULT 0 NOT NULL + rule_type smallint DEFAULT 0 NOT NULL, + scanners text[] ); CREATE TABLE approval_project_rules_groups ( |