summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-07-22 17:04:49 +0200
committerMarin Jankovski <maxlazio@gmail.com>2015-07-22 17:04:49 +0200
commit6e08e7aac490c5758589bd50db331d42dd24219b (patch)
treeb6c2df440c17252da757890e04a02e4135538408
parent39dc39e33529ac3632e5d5a6fa06bf6908fb4fa4 (diff)
downloadgitlab-ce-migrate_session_expire_delay_unless_it_exists.tar.gz
Check if session_expire_delay column exists before adding the column.migrate_session_expire_delay_unless_it_exists
-rw-r--r--db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb b/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb
index ffa22e6d5ef..61ff0af41f4 100644
--- a/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb
+++ b/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb
@@ -1,5 +1,7 @@
class AddSessionExpireDelayForApplicationSettings < ActiveRecord::Migration
def change
- add_column :application_settings, :session_expire_delay, :integer, default: 10080, null: false
+ unless column_exists?(:application_settings, :session_expire_delay)
+ add_column :application_settings, :session_expire_delay, :integer, default: 10080, null: false
+ end
end
-end \ No newline at end of file
+end