summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-05-05 16:00:18 -0300
committerFelipe Artur <felipefac@gmail.com>2017-05-08 18:43:53 -0300
commit2ccee7161a58ea04c66b216ccb57e522850f5d95 (patch)
tree5af6abd2d2e42c59387423f3506cf064c7dc14dd /db
parentd9bebd89dfcf7e4b163b271eea3d7a5c3e99fb5d (diff)
downloadgitlab-ce-2ccee7161a58ea04c66b216ccb57e522850f5d95.tar.gz
Small code improvements and add migration spec
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170507205316_add_head_pipeline_id_to_merge_requests.rb (renamed from db/migrate/20170427205316_add_head_pipeline_id_to_merge_requests.rb)0
-rw-r--r--db/post_migrate/20170508170547_add_head_pipeline_for_each_merge_request.rb (renamed from db/post_migrate/20170428170547_add_head_pipeline_for_each_merge_request.rb)0
-rw-r--r--db/schema.rb3
3 files changed, 1 insertions, 2 deletions
diff --git a/db/migrate/20170427205316_add_head_pipeline_id_to_merge_requests.rb b/db/migrate/20170507205316_add_head_pipeline_id_to_merge_requests.rb
index 8fc6e380a77..8fc6e380a77 100644
--- a/db/migrate/20170427205316_add_head_pipeline_id_to_merge_requests.rb
+++ b/db/migrate/20170507205316_add_head_pipeline_id_to_merge_requests.rb
diff --git a/db/post_migrate/20170428170547_add_head_pipeline_for_each_merge_request.rb b/db/post_migrate/20170508170547_add_head_pipeline_for_each_merge_request.rb
index bc3850c0c23..bc3850c0c23 100644
--- a/db/post_migrate/20170428170547_add_head_pipeline_for_each_merge_request.rb
+++ b/db/post_migrate/20170508170547_add_head_pipeline_for_each_merge_request.rb
diff --git a/db/schema.rb b/db/schema.rb
index d0e10f00ffd..b91b3e6e977 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: 20170506185517) do
+ActiveRecord::Schema.define(version: 20170508170547) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -114,7 +114,6 @@ ActiveRecord::Schema.define(version: 20170506185517) do
t.string "plantuml_url"
t.boolean "plantuml_enabled"
t.integer "terminal_max_session_time", default: 0, null: false
- t.string "default_artifacts_expire_in", default: "0", null: false
t.integer "unique_ips_limit_per_user"
t.integer "unique_ips_limit_time_window"
t.boolean "unique_ips_limit_enabled", default: false, null: false