diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:06:41 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:06:41 +0000 |
commit | da35510cdad8f8d3cb6c119682dc2735531983cd (patch) | |
tree | d42432c9ddc0d55a3c6316cdb539af11244a148f /db | |
parent | 7f82744e89f22bdd2d13f85ca4dc66e088f3da5c (diff) | |
download | gitlab-ce-da35510cdad8f8d3cb6c119682dc2735531983cd.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20191009222222_add_custom_http_clone_url_root_to_application_settings.rb | 13 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/db/migrate/20191009222222_add_custom_http_clone_url_root_to_application_settings.rb b/db/migrate/20191009222222_add_custom_http_clone_url_root_to_application_settings.rb new file mode 100644 index 00000000000..0fa8ff449f7 --- /dev/null +++ b/db/migrate/20191009222222_add_custom_http_clone_url_root_to_application_settings.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddCustomHttpCloneUrlRootToApplicationSettings < ActiveRecord::Migration[5.2] + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + def change + add_column :application_settings, :custom_http_clone_url_root, :string, limit: 511 + end +end diff --git a/db/schema.rb b/db/schema.rb index 8bb2329a0b9..e43eaef911d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -340,6 +340,7 @@ ActiveRecord::Schema.define(version: 2019_10_16_220135) do t.integer "throttle_incident_management_notification_per_period", default: 3600 t.integer "push_event_hooks_limit", default: 3, null: false t.integer "push_event_activities_limit", default: 3, null: false + t.string "custom_http_clone_url_root", limit: 511 t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id" t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id" t.index ["instance_administration_project_id"], name: "index_applicationsettings_on_instance_administration_project_id" |