Set container_registry_token_expire_delay default to 5

2 files changed, 3 insertions, 3 deletions

diff --git a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
index 43a53afa8df..2465c03050c 100644
--- a/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
+++ b/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb
@@ -4,9 +4,9 @@ class AddContainerRegistryTokenExpireDelayToApplicationSettings < ActiveRecord::
   include Gitlab::Database::MigrationHelpers
 
   def change
-    add_column :application_settings, :container_registry_token_expire_delay, :integer
+    add_column :application_settings, :container_registry_token_expire_delay, :integer, default: 5
 
-    # Set default expire delay to 5 minutes
+    # Set expire delay to 5 minutes for existing settings
     execute("update application_settings set container_registry_token_expire_delay = 5")
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 45db86d0802..b2af810f600 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -83,7 +83,7 @@ ActiveRecord::Schema.define(version: 20160530150109) do
     t.text     "disabled_oauth_sign_in_sources"
     t.string   "health_check_access_token"
     t.boolean  "send_user_confirmation_email",          default: false
-    t.integer  "container_registry_token_expire_delay"
+    t.integer  "container_registry_token_expire_delay", default: 5
   end
 
   create_table "audit_events", force: :cascade do |t|