diff options
author | Rémy Coutable <remy@rymai.me> | 2016-09-19 14:22:51 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-09-19 14:22:51 +0300 |
commit | c20e4267e89c1fa84b3eeb9f63e17677388c25e3 (patch) | |
tree | bc1eac011692f0ade7fa9d802f63be9d29fa449a /db | |
parent | 6a9d87b523b2db9561d70fce1c19584c90b289a8 (diff) | |
parent | 4939911e96297aa6ed9fb60f635d7d16a360876f (diff) |
Merge branch 'review-apps' into 'master'
Add support for dynamic environments
Implements proposal described in https://gitlab.com/gitlab-org/gitlab-ce/issues/21971.
Specifically:
- it adds a `.gitlab-ci.yml` configuration,
- it allows environment name to have slashes,
- it allows environment names to use CI predefined variables,
- it allows to specify URL from `.gitlab-ci.yml`,
- it allows the URL to use CI predefined variables,
- it introduces `environment_type` to allow to easily group environments in the future
See merge request !6323
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20160907131111_add_environment_type_to_environments.rb | 9 | ||||
-rw-r--r-- | db/schema.rb | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/db/migrate/20160907131111_add_environment_type_to_environments.rb b/db/migrate/20160907131111_add_environment_type_to_environments.rb new file mode 100644 index 00000000000..fac73753d5b --- /dev/null +++ b/db/migrate/20160907131111_add_environment_type_to_environments.rb @@ -0,0 +1,9 @@ +class AddEnvironmentTypeToEnvironments < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + add_column :environments, :environment_type, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 974f5855cf9..930d41d8bdd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -390,10 +390,11 @@ ActiveRecord::Schema.define(version: 20160913212128) do create_table "environments", force: :cascade do |t| t.integer "project_id" - t.string "name", null: false + t.string "name", null: false t.datetime "created_at" t.datetime "updated_at" t.string "external_url" + t.string "environment_type" end add_index "environments", ["project_id", "name"], name: "index_environments_on_project_id_and_name", using: :btree |