summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-10 12:09:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-10 12:09:36 +0000
commitc6a33b298229f9e04933be43d6176c476ef03012 (patch)
tree66b336ef374b813d6e9c7f6a19264060a1f23f91 /db
parentc52b81f45762cb7f05a950689dfc6d51b197ea73 (diff)
downloadgitlab-ce-c6a33b298229f9e04933be43d6176c476ef03012.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20200401095430_add_jsonb_to_geo_node_status_table.rb14
-rw-r--r--db/structure.sql4
2 files changed, 17 insertions, 1 deletions
diff --git a/db/migrate/20200401095430_add_jsonb_to_geo_node_status_table.rb b/db/migrate/20200401095430_add_jsonb_to_geo_node_status_table.rb
new file mode 100644
index 00000000000..46eb826341c
--- /dev/null
+++ b/db/migrate/20200401095430_add_jsonb_to_geo_node_status_table.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# See https://docs.gitlab.com/ee/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddJsonbToGeoNodeStatusTable < ActiveRecord::Migration[6.0]
+ DOWNTIME = false
+
+ def change
+ change_table :geo_node_statuses do |t|
+ t.jsonb :status, null: false, default: {}
+ end
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index d45ad4f739c..90585a157cf 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2650,7 +2650,8 @@ CREATE TABLE public.geo_node_statuses (
design_repositories_count integer,
design_repositories_synced_count integer,
design_repositories_failed_count integer,
- design_repositories_registry_count integer
+ design_repositories_registry_count integer,
+ status jsonb DEFAULT '{}'::jsonb NOT NULL
);
CREATE SEQUENCE public.geo_node_statuses_id_seq
@@ -13076,6 +13077,7 @@ COPY "schema_migrations" (version) FROM STDIN;
20200331132103
20200331195952
20200331220930
+20200401095430
20200401211005
20200402123926
20200402124802