summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-02-07 12:41:32 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-02-07 12:41:32 +0000
commitd08bf247bc2a99120498e939ba573f44e5f27f07 (patch)
tree6fe348f4ffdc1b104374743a8e4a19621188e895 /db
parent2b5d5b107ccc852f498d226d05d276160fc30c5a (diff)
parent5291c0bb51ae19109e09ff0ee7fca6f118288923 (diff)
downloadgitlab-ce-d08bf247bc2a99120498e939ba573f44e5f27f07.tar.gz
Merge branch '38175-add-domain-field-to-auto-devops-application-setting' into 'master'
Resolve "Add domain field to Auto DevOps application setting" Closes #38175 See merge request gitlab-org/gitlab-ce!16604
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20180122162010_add_auto_devops_domain_to_application_settings.rb13
-rw-r--r--db/schema.rb1
2 files changed, 14 insertions, 0 deletions
diff --git a/db/migrate/20180122162010_add_auto_devops_domain_to_application_settings.rb b/db/migrate/20180122162010_add_auto_devops_domain_to_application_settings.rb
new file mode 100644
index 00000000000..7e16cb83087
--- /dev/null
+++ b/db/migrate/20180122162010_add_auto_devops_domain_to_application_settings.rb
@@ -0,0 +1,13 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddAutoDevopsDomainToApplicationSettings < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+
+ # Set this constant to true if this migration requires downtime.
+ DOWNTIME = false
+
+ def change
+ add_column :application_settings, :auto_devops_domain, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b5e0afa697e..7282ecfc3e7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -155,6 +155,7 @@ ActiveRecord::Schema.define(version: 20180206200543) do
t.integer "gitaly_timeout_medium", default: 30, null: false
t.integer "gitaly_timeout_fast", default: 10, null: false
t.boolean "authorized_keys_enabled", default: true, null: false
+ t.string "auto_devops_domain"
end
create_table "audit_events", force: :cascade do |t|