Merge branch 'fix-another-migration' into 'master'

Prevent another migration from failing due to indirect use of model columns not yet created See https://github.com/gitlabhq/gitlabhq/issues/8817#issuecomment-76007077 cc @marin See merge request !1597

Merge branch 'fix-another-migration' into 'master'
78391fe5 · Dmitriy Zaporozhets · 5cd304dd · 4803af45 · 78391fe5
Commit 78391fe5 authored Feb 26, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

20141006143943_move_slack_service_to_webhook.rb db/migrate/20141006143943_move_slack_service_to_webhook.rb +1 -1

No files found.
--- a/db/migrate/20141006143943_move_slack_service_to_webhook.rb
+++ b/db/migrate/20141006143943_move_slack_service_to_webhook.rb
@@ -10,7 +10,7 @@ class MoveSlackServiceToWebhook < ActiveRecord::Migration
        slack_service.properties.delete('subdomain')
        # Room is configured on the Slack side
        slack_service.properties.delete('room')
-        slack_service.save
+        slack_service.save(validate: false)
      end
    end
  end