Skip to content

Commit

Permalink
Merge branch 'PrestaShop:develop' into 35591-regression-migrated-attr…
Browse files Browse the repository at this point in the history
…ibutes-pages
  • Loading branch information
mattgoud authored Apr 17, 2024
2 parents 475baf6 + 959349f commit 8b8056d
Show file tree
Hide file tree
Showing 132 changed files with 2,120 additions and 2,178 deletions.
16 changes: 16 additions & 0 deletions .github/actions/setup-keycloak/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Setup Keycloak
description: Checkout Keycloak Module for installation and to launch Keycloak docker

runs:
using: 'composite'
steps:
- uses: actions/checkout@v4
name: Checkout Keycloak module
with:
repository: PrestaShop/keycloak_connector_demo
ref: v1.1.0
path: keycloak_connector_demo

- name: Build Keycloak docker and install module via CLI command
run: USER_ID=$(id -u) GROUP_ID=$(id -g) docker compose -f keycloak_connector_demo/docker-compose-ui.yml up -d
shell: bash
5 changes: 5 additions & 0 deletions .github/workflows/cron_nightly_tests_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,11 @@ jobs:
INSTALL_AUTO: ${{ env.INSTALL_AUTO }}
CP_API_CONFIG: ${{ (env.GH_BRANCH == '8.1.x') && 'true' || 'false' }}

# Keycloak is only needed for API campaign
- name: Setup Keycloak
uses: ./.github/actions/setup-keycloak
if: ${{ env.GH_BRANCH == 'develop' && env.TEST_CAMPAIGN == 'functional:API' }}

- name: Run Tests
continue-on-error: true
uses: ./.github/actions/ui-test
Expand Down
2 changes: 1 addition & 1 deletion admin-dev/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

$kernel = new AdminKernel(_PS_ENV_, _PS_MODE_DEV_);
// When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
//Request::enableHttpMethodParameterOverride();
Request::enableHttpMethodParameterOverride();
$request = Request::createFromGlobals();
Request::setTrustedProxies([], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO);

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

35 changes: 0 additions & 35 deletions admin-dev/themes/default/template/controllers/attributes/index.php

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 8b8056d

Please sign in to comment.