Add latest changes from gitlab-org/gitlab@master

5 files changed, 40 insertions, 0 deletions

diff --git a/db/migrate/20200913115700_add_kroki_application_settings.rb b/db/migrate/20200913115700_add_kroki_application_settings.rb
new file mode 100644
index 00000000000..84d490c2980
--- /dev/null
+++ b/db/migrate/20200913115700_add_kroki_application_settings.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddKrokiApplicationSettings < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  # rubocop:disable Migration/AddLimitToTextColumns
+  # limit is added in 20201011005400_add_text_limit_to_application_settings_kroki_url.rb
+  #
+  def change
+    add_column :application_settings, :kroki_url, :text
+    add_column :application_settings, :kroki_enabled, :boolean, default: false, null: false
+  end
+  # rubocop:enable Migration/AddLimitToTextColumns
+end
diff --git a/db/migrate/20201011005400_add_text_limit_to_application_settings_kroki_url.rb b/db/migrate/20201011005400_add_text_limit_to_application_settings_kroki_url.rb
new file mode 100644
index 00000000000..96427cc3454
--- /dev/null
+++ b/db/migrate/20201011005400_add_text_limit_to_application_settings_kroki_url.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddTextLimitToApplicationSettingsKrokiUrl < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit :application_settings, :kroki_url, 1024
+  end
+
+  def down
+    # Down is required as `add_text_limit` is not reversible
+    #
+    remove_text_limit :application_settings, :kroki_url
+  end
+end
diff --git a/db/schema_migrations/20200913115700 b/db/schema_migrations/20200913115700
new file mode 100644
index 00000000000..cb0f401efee
--- /dev/null
+++ b/db/schema_migrations/20200913115700
@@ -0,0 +1 @@
+dd2ada53f01debcc91070525e4386db959b91881a8945e9082d0b3318ceb35cf
\ No newline at end of file
diff --git a/db/schema_migrations/20201011005400 b/db/schema_migrations/20201011005400
new file mode 100644
index 00000000000..1715d21e424
--- /dev/null
+++ b/db/schema_migrations/20201011005400
@@ -0,0 +1 @@
+07bfc8e9a684ae64b7d78c9d867f9bafebd46678f6f168aa87d2ad7f0e85d75e
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index d75d3d6f5c9..053cab899bb 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -9320,6 +9320,8 @@ CREATE TABLE application_settings (
     elasticsearch_indexed_file_size_limit_kb integer DEFAULT 1024 NOT NULL,
     enforce_namespace_storage_limit boolean DEFAULT false NOT NULL,
     container_registry_delete_tags_service_timeout integer DEFAULT 250 NOT NULL,
+    kroki_url character varying,
+    kroki_enabled boolean,
     elasticsearch_client_request_timeout integer DEFAULT 0 NOT NULL,
     gitpod_enabled boolean DEFAULT false NOT NULL,
     gitpod_url text DEFAULT 'https://gitpod.io/'::text,
@@ -9347,6 +9349,7 @@ CREATE TABLE application_settings (
     secret_detection_revocation_token_types_url text,
     cloud_license_enabled boolean DEFAULT false NOT NULL,
     CONSTRAINT app_settings_registry_exp_policies_worker_capacity_positive CHECK ((container_registry_expiration_policies_worker_capacity >= 0)),
+    CONSTRAINT check_17d9558205 CHECK ((char_length((kroki_url)::text) <= 1024)),
     CONSTRAINT check_2dba05b802 CHECK ((char_length(gitpod_url) <= 255)),
     CONSTRAINT check_51700b31b5 CHECK ((char_length(default_branch_name) <= 255)),
     CONSTRAINT check_57123c9593 CHECK ((char_length(help_page_documentation_base_url) <= 255)),