Merge branch 'main' into icons

monicahq · Oct 8, 2024 · d16beb9 · d16beb9
2 parents a618903 + b1802b4
commit d16beb9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -72,7 +72,7 @@ jobs:
       # Build docker
       - name: Docker build
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}

diff --git a/app/Domains/Settings/ManageAddressTypes/Web/Controllers/PersonalizeAddressTypeController.php b/app/Domains/Settings/ManageAddressTypes/Web/Controllers/PersonalizeAddressTypeController.php
@@ -3,9 +3,9 @@
 namespace App\Domains\Settings\ManageAddressTypes\Web\Controllers;
 
 use App\Domains\Settings\ManageAddressTypes\Services\CreateAddressType;
+use App\Domains\Settings\ManageAddressTypes\Services\DestroyAddressType;
 use App\Domains\Settings\ManageAddressTypes\Services\UpdateAddressType;
 use App\Domains\Settings\ManageAddressTypes\Web\ViewHelpers\PersonalizeAddressTypeIndexViewHelper;
-use App\Domains\Settings\ManagePronouns\Services\DestroyPronoun;
 use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
@@ -61,7 +61,7 @@ public function destroy(Request $request, int $addressTypeId)
             'address_type_id' => $addressTypeId,
         ];
 
-        (new DestroyPronoun)->execute($data);
+        (new DestroyAddressType)->execute($data);
 
         return response()->json([
             'data' => true,

diff --git a/app/Domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationType.php b/app/Domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationType.php
@@ -47,6 +47,6 @@ public function execute(array $data): ContactInformationType
             'protocol' => $this->valueOrNull($data, 'protocol'),
         ]);
 
-        return $type;
+        return $type->refresh();
     }
 }
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
@@ -145,7 +145,7 @@ RUN set -ex; \
     a2enconf remoteip
 
 # set apache config LimitRequestBody
-ENV APACHE_BODY_LIMIT 1073741824
+ENV APACHE_BODY_LIMIT=1073741824
 RUN set -ex; \
     \
     { \

diff --git a/yarn.lock b/yarn.lock
@@ -1448,7 +1448,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"braces@npm:^3.0.2, braces@npm:^3.0.3, braces@npm:~3.0.2":
+"braces@npm:^3.0.3, braces@npm:~3.0.2":
   version: 3.0.3
   resolution: "braces@npm:3.0.3"
   dependencies:
@@ -3129,17 +3129,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "micromatch@npm:4.0.5"
-  dependencies:
-    braces: "npm:^3.0.2"
-    picomatch: "npm:^2.3.1"
-  checksum: 10c0/3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff
-  languageName: node
-  linkType: hard
-
-"micromatch@npm:~4.0.8":
+"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5, micromatch@npm:~4.0.8":
   version: 4.0.8
   resolution: "micromatch@npm:4.0.8"
   dependencies: