diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php index 5e4a84ea4b..5a989ebd74 100644 --- a/app/Http/Controllers/Api/SettingsController.php +++ b/app/Http/Controllers/Api/SettingsController.php @@ -196,7 +196,7 @@ class SettingsController extends Controller return response()->json(['message' => 'Success'], 200); } catch (\Exception $e) { - return response()->json(['message' => 'FARTS! Please check the channel name and webhook endpoint URL ('.$request->input('slack_endpoint').'). Slack responded with: '.$e->getMessage()], 400); + return response()->json(['message' => 'Please check the channel name and webhook endpoint URL ('.$request->input('slack_endpoint').'). Slack responded with: '.$e->getMessage()], 400); } //} diff --git a/database/migrations/2014_11_04_231416_update_group_field_for_reporting.php b/database/migrations/2014_11_04_231416_update_group_field_for_reporting.php index 248e26dde2..d66c7c5fbe 100644 --- a/database/migrations/2014_11_04_231416_update_group_field_for_reporting.php +++ b/database/migrations/2014_11_04_231416_update_group_field_for_reporting.php @@ -22,12 +22,12 @@ class UpdateGroupFieldForReporting extends Migration { if (Schema::hasTable('permission_groups')) { - Group::where('id', 1)->update(['permissions' => '{"users-poop":1,"reports":1}']); - Group::where('id', 2)->update(['permissions' => '{"users-pop":1,"reports":1}']); + Group::where('id', 1)->update(['permissions' => '{"users-foo":1,"reports":1}']); + Group::where('id', 2)->update(['permissions' => '{"users-foo":1,"reports":1}']); } elseif (Schema::hasTable('groups')) { - DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"admin-farts":1,"users":1,"reports":1}', 1]); - DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"users-farts":1,"reports":1}', 2]); + DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"admin-foo":1,"users":1,"reports":1}', 1]); + DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"users-foo":1,"reports":1}', 2]); } }