Skip to content

Commit af9ee91

Browse files
committed
Merge branch 'master' into refactor/react
* master: Updated dependencies Priority WS for optimal transport browser (#250) Ignore suggestions when installing Composer deps (#252) Fix style issue Revert "[Snyk Alert] Fix for 2 vulnerable dependency paths" (#245) fix: package.json & .snyk to reduce vulnerabilities (#244) Conflicts: composer.lock resources/assets/js/app.js
2 parents c68e650 + e570089 commit af9ee91

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

composer.lock

+17-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/nginx.conf

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ server {
66
listen 80;
77
server_name deployer.app;
88
root "/var/www/deployer/public";
9-
10-
index index.php;
11-
129
charset utf-8;
1310

1411
location / {
12+
index index.php;
1513
try_files $uri $uri/ /index.php?$query_string;
1614
}
1715

@@ -42,7 +40,7 @@ server {
4240
proxy_pass http://websocket;
4341
}
4442

45-
location ~ /\.ht {
43+
location ~* /\.(?!well-known\/) {
4644
deny all;
4745
}
4846
}

resources/scripts/deploy/steps/InstallComposerDependencies.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ if [ -f {{ release_path }}/composer.json ]; then
2525

2626
if [ -n "{{ include_dev }}" ]; then
2727
${composer} install --no-interaction --optimize-autoloader \
28-
--prefer-dist --no-ansi --working-dir "{{ release_path }}"
28+
--prefer-dist --no-suggest --no-ansi --working-dir "{{ release_path }}"
2929
else
3030
${composer} install --no-interaction --optimize-autoloader \
31-
--no-dev --prefer-dist --no-ansi --working-dir "{{ release_path }}"
31+
--no-dev --prefer-dist --no-suggest --no-ansi --working-dir "{{ release_path }}"
3232
fi
3333
fi
3434

0 commit comments

Comments
 (0)