summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-08-31 20:25:25 +0900
committerShinya Maeda <shinya@gitlab.com>2017-09-03 23:49:10 +0900
commitf3d3cecf5a7691c5df48fc6b0f3d206cd57203db (patch)
tree1f54de372a9f1ce67fdca2f052079fb6e644b872
parent07f7a01b4da02533c417fa636f004fedf3c4c661 (diff)
downloadgitlab-ce-f3d3cecf5a7691c5df48fc6b0f3d206cd57203db.tar.gz
Fix schema. Add safe_model_attributes for pipelines
-rw-r--r--db/schema.rb2
-rw-r--r--spec/lib/gitlab/import_export/safe_model_attributes.yml1
2 files changed, 2 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb
index c41c9e98a4f..a5f867df9ae 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: 20170830125940) do
+ActiveRecord::Schema.define(version: 20170824162758) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 8c4810f292e..27f2ce60084 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -224,6 +224,7 @@ Ci::Pipeline:
- lock_version
- auto_canceled_by_id
- pipeline_schedule_id
+- protected
Ci::Stage:
- id
- name