Merge branch 'migrate_session_expire_delay_unless_it_exists' into 'master'

Check if session_expire_delay column exists before adding the column.

Fixes #2052 

Fixes #1985

See merge request !1029

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