Merge branch 'release/2.2.5' into main

daveroverts · Nov 14, 2021 · 4e27c6d · 4e27c6d
2 parents e214d44 + 70abee7
commit 4e27c6d
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 32 deletions.
diff --git a/.env.example b/.env.example
@@ -47,12 +47,6 @@ AWS_DEFAULT_REGION=us-east-1
 AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
 
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=false
-
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
@@ -93,7 +87,7 @@ LARAVEL_PAGE_SPEED_ENABLE=true
 ACTIVITY_LOGGER_ENABLED=true
 TELESCOPE_ENABLED=false
 
-IGNITION_EDITOR=phpstorm
+IGNITION_EDITOR=vscode
 IGNITION_THEME=auto
 IGNITION_REMOTE_SITES_PATH=
 IGNITION_LOCAL_SITES_PATH=
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -101,7 +101,7 @@ jobs:
   deploy:
     name: Run Deployment
     concurrency: production_environment
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     needs: build-js
     steps:
@@ -137,7 +137,7 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader --no-dev
 
       - name: Run Deployment [Production]
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         uses: deployphp/action@master
         with:
           private-key: ${{ secrets.SSH_PRIVATE_KEY }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v2.2.5](https://github.com/daveroverts/bmac/compare/v2.2.4a...v2.2.5) - 2021-11-14
+
+### Changed
+- `master` branch renamed to `main`
+- Laravel Horizon and Laravel Telescope use dark theme by default.
+- Fix for Laravel Horizon and Laravel Telescope gates failing in non-local environments
+- Fix for Bootstrap pagination + jQuery UI (for datepicker) missing CSS.
+- The very first `users` table migration now does not include unique index. #357
+
 ## [v2.2.4a](https://github.com/daveroverts/bmac/compare/v2.2.4...v2.2.4a) - 2021-11-08
 
 ### Changed

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "facade/ignition": "^2.3.6",
         "fideloper/proxy": "^4.0",
         "fruitcake/laravel-cors": "^2.0",
-        "laravel/framework": "^8.0",
+        "laravel/framework": "^8.70",
         "laravel/horizon": "^5.7",
         "laravel/telescope": "^4.6",
         "laravel/tinker": "^2.0",
@@ -31,15 +31,15 @@
         "tabuna/breadcrumbs": "^2.0"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "^3.2",
-        "barryvdh/laravel-ide-helper": "^2.6",
-        "beyondcode/laravel-query-detector": "^1.1",
-        "enlightn/security-checker": "^1.5",
+        "barryvdh/laravel-debugbar": "^3.6",
+        "barryvdh/laravel-ide-helper": "^2.10",
+        "beyondcode/laravel-query-detector": "^1.5",
+        "enlightn/security-checker": "^1.9",
         "fakerphp/faker": "^1.16",
         "laravel/sail": "^1.12",
-        "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.0"
+        "mockery/mockery": "^1.4",
+        "nunomaduro/collision": "^5.10",
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -15,9 +15,9 @@ public function up()
     {
         Schema::create('users', function (Blueprint $table) {
             $table->unsignedInteger('id')->primary();
-            $table->string('name_first',50);
-            $table->string('name_last',50);
-            $table->string('email')->unique();
+            $table->string('name_first', 50);
+            $table->string('name_last', 50);
+            $table->string('email');
             $table->string('country');
             $table->string('region');
             $table->string('division');

diff --git a/database/migrations/2020_12_14_184226_drop_users_email_unique_from_users_table.php b/database/migrations/2020_12_14_184226_drop_users_email_unique_from_users_table.php
@@ -13,9 +13,10 @@ class DropUsersEmailUniqueFromUsersTable extends Migration
      */
     public function up()
     {
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropUnique('users_email_unique');
-        });
+        return;
+        // Schema::table('users', function (Blueprint $table) {
+        //     $table->dropUnique('users_email_unique');
+        // });
     }
 
     /**
@@ -25,8 +26,9 @@ public function up()
      */
     public function down()
     {
-        Schema::table('users', function (Blueprint $table) {
-            $table->unique('email');
-        });
+        return;
+        // Schema::table('users', function (Blueprint $table) {
+        //     $table->unique('email');
+        // });
     }
 }