Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic update #351

Merged
merged 1 commit into from
May 7, 2024
Merged

Automatic update #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ public/modules/contrib
public/themes/contrib
public/sites/default/files
vendor
helfi-test-automation-python/
public/sites/simpletest/
public/sites/backstop/

# Ignore the folder created by PhpStorm
.idea/*
Expand Down
507 changes: 343 additions & 164 deletions composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions conf/cmi/core.extension.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ module:
metatag_open_graph: 0
metatag_twitter_cards: 0
migrate: 0
monolog: 0
mysql: 0
node: 0
oembed_providers: 0
Expand Down
4 changes: 3 additions & 1 deletion conf/cmi/helfi_api_base.features.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
logger: true
disable_email_sending: true
disable_user_password: true
user_expire: true
logger: true
22 changes: 0 additions & 22 deletions conf/cmi/rest.resource.helfi_debug_data.yml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions conf/cmi/system.action.user_add_role_action.debug_api.yml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions conf/cmi/system.action.user_remove_role_action.debug_api.yml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions conf/cmi/user.role.debug_api.yml
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions docker/openshift/custom.locations
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
location ~ ^/(?:.*)-assets/(.*)$ {
proxy_redirect off;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://127.0.0.1:8080/$1$is_args$args;
}

location ~* \.(css|cur|js|jpe?g|gif|htc|ico|png|xml|otf|ttf|eot|woff|woff2|svg|mp4|svgz|ogg|ogv|pdf|pptx?|zip|tgz|gz|rar|bz2|doc|xls|exe|tar|mid|midi|wav|bmp|rtf|txt|map)$ {
add_header Access-Control-Allow-Origin "*";
try_files $uri @rewrite;
Expand Down