Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	config/version.php
  • Loading branch information
snipe committed Feb 5, 2021
2 parents 19820f1 + 681c41b commit 834e0a9
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 5 deletions.
10 changes: 5 additions & 5 deletions config/version.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v5.1.0',
'full_app_version' => 'v5.1.0 - build 5772-g124343911',
'build_version' => '5772',
'app_version' => 'v5.1.1',
'full_app_version' => 'v5.1.1 - build 5811-',
'build_version' => '5811',
'prerelease_version' => '',
'hash_version' => 'g124343911',
'full_hash' => 'v5.1.0-46-g124343911',
'hash_version' => '',
'full_hash' => 'v5.1.1',
'branch' => 'master',
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

class AddProviderToOauthTable extends Migration
{
/**
* Run the migrations.
* Sigh. https://github.com/laravel/passport/blob/master/UPGRADE.md#upgrading-to-90-from-8x
*
* @return void
*/
public function up()
{
Schema::table('oauth_clients', function (Blueprint $table) {
$table->string('provider')->after('secret')->nullable();
});
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('oauth_clients', function (Blueprint $table) {
$table->dropColumn('provider');
});

}
}

0 comments on commit 834e0a9

Please sign in to comment.