summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-10-17 15:34:30 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-10-17 15:34:30 +0200
commit18bb0a5696cd701d3a77c059fabb5d2f798f3a83 (patch)
tree04e65fb671d4c910f937476c5aa6c236e509f0d0
parent63312b9860e6b8d46b7e8ca60cbf4954398ce0c4 (diff)
downloadgitlab-ce-18bb0a5696cd701d3a77c059fabb5d2f798f3a83.tar.gz
Add on_stop column [ci skip]
-rw-r--r--app/models/deployment.rb2
-rw-r--r--db/migrate/20161017095000_add_properties_to_deployment.rb22
-rw-r--r--db/schema.rb2
3 files changed, 2 insertions, 24 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 18d9e96301c..f6cccae4334 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -11,8 +11,6 @@ class Deployment < ActiveRecord::Base
delegate :name, to: :environment, prefix: true
- store :properties, accessors: [:on_stop]
-
after_save :create_ref
def commit
diff --git a/db/migrate/20161017095000_add_properties_to_deployment.rb b/db/migrate/20161017095000_add_properties_to_deployment.rb
index 6371166a4d2..f620ee0de1c 100644
--- a/db/migrate/20161017095000_add_properties_to_deployment.rb
+++ b/db/migrate/20161017095000_add_properties_to_deployment.rb
@@ -1,29 +1,9 @@
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
class AddPropertiesToDeployment < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
- # Set this constant to true if this migration requires downtime.
DOWNTIME = false
- # When a migration requires downtime you **must** uncomment the following
- # constant and define a short and easy to understand explanation as to why the
- # migration requires downtime.
- # DOWNTIME_REASON = ''
-
- # When using the methods "add_concurrent_index" or "add_column_with_default"
- # you must disable the use of transactions as these methods can not run in an
- # existing transaction. When using "add_concurrent_index" make sure that this
- # method is the _only_ method called in the migration, any other changes
- # should go in a separate migration. This ensures that upon failure _only_ the
- # index creation fails and can be retried or reverted easily.
- #
- # To disable transactions uncomment the following line and remove these
- # comments:
- # disable_ddl_transaction!
-
def change
- add_column :deployments, :properties, :text
+ add_column :deployments, :on_stop, :string
end
end
diff --git a/db/schema.rb b/db/schema.rb
index f568a5ec699..d4e35626e9b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -380,7 +380,7 @@ ActiveRecord::Schema.define(version: 20161017095000) do
t.string "deployable_type"
t.datetime "created_at"
t.datetime "updated_at"
- t.text "properties"
+ t.string "on_stop"
end
add_index "deployments", ["project_id", "environment_id", "iid"], name: "index_deployments_on_project_id_and_environment_id_and_iid", using: :btree