Skip to content

Commit

Permalink
Merge branch 'master' into refactor/react
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
REBELinBLUE committed Jul 23, 2016
2 parents c68e650 + e570089 commit af9ee91
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 22 deletions.
33 changes: 17 additions & 16 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions examples/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ server {
listen 80;
server_name deployer.app;
root "/var/www/deployer/public";

index index.php;

charset utf-8;

location / {
index index.php;
try_files $uri $uri/ /index.php?$query_string;
}

Expand Down Expand Up @@ -42,7 +40,7 @@ server {
proxy_pass http://websocket;
}

location ~ /\.ht {
location ~* /\.(?!well-known\/) {
deny all;
}
}
4 changes: 2 additions & 2 deletions resources/scripts/deploy/steps/InstallComposerDependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ if [ -f {{ release_path }}/composer.json ]; then

if [ -n "{{ include_dev }}" ]; then
${composer} install --no-interaction --optimize-autoloader \
--prefer-dist --no-ansi --working-dir "{{ release_path }}"
--prefer-dist --no-suggest --no-ansi --working-dir "{{ release_path }}"
else
${composer} install --no-interaction --optimize-autoloader \
--no-dev --prefer-dist --no-ansi --working-dir "{{ release_path }}"
--no-dev --prefer-dist --no-suggest --no-ansi --working-dir "{{ release_path }}"
fi
fi

Expand Down

0 comments on commit af9ee91

Please sign in to comment.