summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-10-06 14:16:03 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-10-06 14:16:03 +0200
commit0e1f39d8cee3a6d23fccb195f8257178df840805 (patch)
tree6e84589c4c567e69680718b911b075c53d188687 /db
parentc319cc5ab5064459aaf803ee719a08e9663726ea (diff)
downloadgitlab-ce-0e1f39d8cee3a6d23fccb195f8257178df840805.tar.gz
Allow to close environments
Diffstat (limited to 'db')
-rw-r--r--db/fixtures/development/14_pipelines.rb1
-rw-r--r--db/schema.rb5
2 files changed, 4 insertions, 2 deletions
diff --git a/db/fixtures/development/14_pipelines.rb b/db/fixtures/development/14_pipelines.rb
index 803cbca584d..d3fabe111a1 100644
--- a/db/fixtures/development/14_pipelines.rb
+++ b/db/fixtures/development/14_pipelines.rb
@@ -17,6 +17,7 @@ class Gitlab::Seeder::Pipelines
{ name: 'env:beta', stage: 'deploy', environment: 'beta', status: :running },
{ name: 'env:gamma', stage: 'deploy', environment: 'gamma', status: :canceled },
{ name: 'staging', stage: 'deploy', environment: 'staging', status_event: :success },
+ { name: 'close staging', stage: 'deploy', environment: 'staging', when: 'manual', status: :skipped, options: { environment: { close: true } } },
{ name: 'production', stage: 'deploy', environment: 'production', when: 'manual', status: :skipped },
{ name: 'slack', stage: 'notify', when: 'manual', status: :created },
]
diff --git a/db/schema.rb b/db/schema.rb
index ad62c249b3f..b9dc5b5f895 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160926145521) do
+ActiveRecord::Schema.define(version: 20161006104309) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -392,11 +392,12 @@ ActiveRecord::Schema.define(version: 20160926145521) 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"
+ t.string "state", default: "opened", null: false
end
add_index "environments", ["project_id", "name"], name: "index_environments_on_project_id_and_name", using: :btree