DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2021-02-05 14:29:13 -08:00
parent 19820f1b42 681c41bd18
commit 834e0a9dd5
2 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/version.php
View file

@ -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',
);

34
database/migrations/2021_02_05_172502_add_provider_to_oauth_table.php Normal file
View file

@ -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');
});
}
}