diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-26 02:53:37 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-26 02:53:37 +0000 |
commit | 78391fe5a06136c2650fe0e1fa434693bae8002b (patch) | |
tree | 4e8c9e0f49a9a8760997159c7a8d894cafd9fbd6 /db | |
parent | 5cd304dd5e6df7cf8d587d8cf59fa8b49aee276a (diff) | |
parent | 4803af45dfbd516890b3ab31fa55b93009174d63 (diff) | |
download | gitlab-ce-78391fe5a06136c2650fe0e1fa434693bae8002b.tar.gz |
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
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20141006143943_move_slack_service_to_webhook.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/20141006143943_move_slack_service_to_webhook.rb b/db/migrate/20141006143943_move_slack_service_to_webhook.rb index a8e07033a5d..5836cd6b8db 100644 --- 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 |