Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: oroinc/orocommerce-application
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: oroinc/orocommerce-application
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5.1
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
Loading
Showing with 24,714 additions and 4,683 deletions.
  1. +16 −3 .env-app
  2. +3 −0 .env-app.test
  3. +1 −0 .gitattributes
  4. +3 −0 .gitignore
  5. +249 −392 3rd-party-dependencies.md
  6. +275 −0 Jenkinsfile
  7. +20 −0 README.md
  8. +5 −0 UPGRADE.md
  9. +110 −324 Vagrantfile
  10. +18,944 −0 composer.lock
  11. +12 −4 config/config.yml
  12. +2 −0 config/config_prod.yml
  13. +33 −0 config/robots.txt.dist
  14. +4 −19 dev.json
  15. +2,214 −1,682 dev.lock
  16. +2,818 −2,255 package-lock.json
  17. +5 −4 package.json
  18. 0 var/sessions/.gitkeep
19 changes: 16 additions & 3 deletions .env-app
Original file line number Diff line number Diff line change
@@ -39,9 +39,12 @@ ORO_SESSION_DSN=native:
###< session config ###

###> websocket config ###
ORO_WEBSOCKET_SERVER_DSN=//0.0.0.0:8080
ORO_WEBSOCKET_FRONTEND_DSN=//*:8080/ws
ORO_WEBSOCKET_BACKEND_DSN=tcp://127.0.0.1:8080
# websocket server DSN example: //0.0.0.0:8080
ORO_WEBSOCKET_SERVER_DSN=
# websocket client frontend DSN example: //*:8080/ws
ORO_WEBSOCKET_FRONTEND_DSN=
# websocket client backend DSN example: tcp://127.0.0.1:8080
ORO_WEBSOCKET_BACKEND_DSN=
###< websocket config ###

###> message queue config ###
@@ -62,3 +65,13 @@ ORO_REDIS_CACHE_DSN=${ORO_REDIS_URL}/1
ORO_REDIS_DOCTRINE_DSN=${ORO_REDIS_URL}/2
ORO_REDIS_LAYOUT_DSN=${ORO_REDIS_URL}/3
###< redis cache config ###

###> maintenance mode config ###
# Specify path for the maintenance lock file in the system
# To activate maintenance mode, run `lexik:maintenance:lock` ORO command
ORO_MAINTENANCE_LOCK_FILE_PATH=%kernel.project_dir%/var/cache/maintenance_lock
###< maintenance mode config ###

###> logging config ###
ORO_LOG_STACKTRACE_LEVEL="error"
###< logging config ###
3 changes: 3 additions & 0 deletions .env-app.test
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
ORO_DB_URL=postgres://root@127.0.0.1/b2b_crm_dev_test
ORO_DB_DSN=${ORO_DB_URL}
ORO_MAILER_DSN=smtp://127.0.0.1
ORO_WEBSOCKET_SERVER_DSN=
ORO_WEBSOCKET_FRONTEND_DSN=
ORO_WEBSOCKET_BACKEND_DSN=
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/.env-* text eol=lf
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ composer.lock
!var/cache/
/var/cache/*
!var/cache/.gitkeep
!var/sessions/
/var/sessions/*
!var/sessions/.gitkeep
!var/logs/
/var/logs/*
!var/logs/.gitkeep
Loading