Skip to content

Commit 834e0a9

Browse files
committed
Merge remote-tracking branch 'origin/develop'
# Conflicts: # config/version.php
2 parents 19820f1 + 681c41b commit 834e0a9

File tree

2 files changed

+39
-5
lines changed

2 files changed

+39
-5
lines changed

config/version.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22
return array (
3-
'app_version' => 'v5.1.0',
4-
'full_app_version' => 'v5.1.0 - build 5772-g124343911',
5-
'build_version' => '5772',
3+
'app_version' => 'v5.1.1',
4+
'full_app_version' => 'v5.1.1 - build 5811-',
5+
'build_version' => '5811',
66
'prerelease_version' => '',
7-
'hash_version' => 'g124343911',
8-
'full_hash' => 'v5.1.0-46-g124343911',
7+
'hash_version' => '',
8+
'full_hash' => 'v5.1.1',
99
'branch' => 'master',
1010
);
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Support\Facades\Schema;
6+
7+
class AddProviderToOauthTable extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
* Sigh. https://github.com/laravel/passport/blob/master/UPGRADE.md#upgrading-to-90-from-8x
12+
*
13+
* @return void
14+
*/
15+
public function up()
16+
{
17+
Schema::table('oauth_clients', function (Blueprint $table) {
18+
$table->string('provider')->after('secret')->nullable();
19+
});
20+
}
21+
22+
/**
23+
* Reverse the migrations.
24+
*
25+
* @return void
26+
*/
27+
public function down()
28+
{
29+
Schema::table('oauth_clients', function (Blueprint $table) {
30+
$table->dropColumn('provider');
31+
});
32+
33+
}
34+
}

0 commit comments

Comments
 (0)