diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-27 00:10:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-27 00:10:49 +0300 |
commit | 84d72a5660ac1f3c55026b8781152a9bcbe13fa2 (patch) | |
tree | 34e4bbdcbb91f6c67f99f5f69b52be140f9c8763 /db | |
parent | 4c47bc5ec6420ab3a4ef629010e89de45b2776b9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20210331000934_add_config_to_ci_runners.rb | 7 | ||||
-rw-r--r-- | db/schema_migrations/20210331000934 | 1 | ||||
-rw-r--r-- | db/structure.sql | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/db/migrate/20210331000934_add_config_to_ci_runners.rb b/db/migrate/20210331000934_add_config_to_ci_runners.rb new file mode 100644 index 00000000000..e9a5fadc613 --- /dev/null +++ b/db/migrate/20210331000934_add_config_to_ci_runners.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddConfigToCiRunners < ActiveRecord::Migration[6.0] + def change + add_column :ci_runners, :config, :jsonb, default: {}, null: false + end +end diff --git a/db/schema_migrations/20210331000934 b/db/schema_migrations/20210331000934 new file mode 100644 index 00000000000..1d55b126d60 --- /dev/null +++ b/db/schema_migrations/20210331000934 @@ -0,0 +1 @@ +0bd47f9055aab927a4e8efb4f995f44532880926af9892af60f7d2b8dcdef4a6
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 5c5aeaf93a9..d550c0f7eaa 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -11148,7 +11148,8 @@ CREATE TABLE ci_runners ( runner_type smallint NOT NULL, token_encrypted character varying, public_projects_minutes_cost_factor double precision DEFAULT 0.0 NOT NULL, - private_projects_minutes_cost_factor double precision DEFAULT 1.0 NOT NULL + private_projects_minutes_cost_factor double precision DEFAULT 1.0 NOT NULL, + config jsonb DEFAULT '{}'::jsonb NOT NULL ); CREATE SEQUENCE ci_runners_id_seq |