From 2431a46d354485ee1dd25137a0448efee1a96ed9 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 11 Jan 2017 19:30:16 +0200 Subject: [PATCH] Merge fix for migrations --- database/migrations/2016_07_08_083802_support_new_pricing.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2016_07_08_083802_support_new_pricing.php b/database/migrations/2016_07_08_083802_support_new_pricing.php index cfb941345642..98df8cad42d7 100644 --- a/database/migrations/2016_07_08_083802_support_new_pricing.php +++ b/database/migrations/2016_07_08_083802_support_new_pricing.php @@ -30,7 +30,7 @@ class SupportNewPricing extends Migration // https://github.com/invoiceninja/invoiceninja/pull/955 Schema::table('activities', function (Blueprint $table) { $table->integer('task_id')->after('invitation_id')->nullable(); - $table->dropForeign('activities_client_id_foreign'); + $table->unsignedInteger('client_id')->nullable()->change(); }); // https://github.com/invoiceninja/invoiceninja/pull/950