Code

Fix Merge Conflicts#4

Code

Closed

devotox wants to merge 33 commits intotrentmwillis:fastboottrentmwillis/ember-engines:fastbootfrom devotox:fastbootdevotox/ember-engines:fastbootCopy head branch name to clipboard

+291-66

Commits

Commits on May 24, 2017

• bump babel-plugin, fixes ember-engines#419

  stefanpenner

  committed
  b81cd17

• Merge pull request ember-engines#420 from ember-engines/fix-stuff

  Show description for cd05ef3
  rwjblue

  authored
  cd05ef3

Commits on May 25, 2017

• Returning value from '_externalAliasMethod', so that transitionToExternal and replaceWithExternal return a thenable Transition object

  catrider

  committed
  fadebe9

Commits on May 26, 2017

• Cleaned up tests

  catrider

  committed
  a8606e2

• Merge pull request ember-engines#421 from catrider/transition-to-external-fix

  Show description for 92af826
  trentmwillis

  authored
  92af826

Commits on Jun 2, 2017

• Update lazyLoading option to accept a hash

  mike183

  committed
  5106546

• Pass entire lazyLoading object to calculateCacheKeyForTree

  mike183

  committed
  4458bd4

Commits on Jun 3, 2017

• Introduce lazyLoading.includeRoutesInApplication option

  mike183

  committed
  ba63949

• Merge pull request ember-engines#424 from status200/lazyloading-hash

  Show description for a28578a
  rwjblue

  authored
  a28578a

Commits on Jun 5, 2017

• Refactor lazyLoading.includeRoutesInApplication implementation

  mike183

  committed
  9757b83

• lazyLoading.includeRoutesInApplication Tests

  mike183

  committed
  d4c1b8d

Commits on Jun 6, 2017

• blueprint updates to conform with latest cli style

  

  Kelly Selden

  committed
  f479c2a

Commits on Jun 7, 2017

• Merge pull request ember-engines#427 from kellyselden/blueprint_updates

  Show description for 9e5e79b
  trentmwillis

  authored
  9e5e79b

• Use new lazyLoading format in in-repo-engine blueprint

  mike183

  committed
  957b60a

Commits on Jun 8, 2017

• Merge pull request ember-engines#430 from status200/update-in-repo-engine-blueprint

  Show description for 43508bf
  rwjblue

  authored
  43508bf

• moving lazy loading to completed

  

  Kelly Selden

  authored
  3d73a0a

Commits on Jun 9, 2017

• Merge pull request ember-engines#431 from kellyselden/patch-1

  Show description for 782fcd3
  trentmwillis

  authored
  782fcd3

Commits on Jun 10, 2017

• Use cacheKeyForTree to improve the addon dedup

  

  Danail Nachev

  committed
  b16f855

Commits on Jun 12, 2017

• Wrap engineRoutesTree in debugTree

  mike183

  committed
  1257b65

• Merge pull request ember-engines#422 from dnachev/cache-key-dedup

  Show description for 1ff177f
  rwjblue

  authored
  1ff177f

• v0.5.5

  rwjblue

  committed
  6d98b75

• v0.5.6

  rwjblue

  committed
  b0e3d06

Commits on Jun 13, 2017

• -Update so that addons can accept asset POJOs containing environment-specific properties, instead of just string paths.

  Show description for c6aff04
  

  Shane Afsar

  authored and

  buschtoens

  committed
  c6aff04

• Copy env from original host to target.

  Show description for add8c19
  

  rwjblue

  authored and

  buschtoens

  committed
  add8c19

• guard for undefined asset paths

  buschtoens

  committed
  4500888

• Ensure routes are not incorrectly extracted

  mike183

  committed
  40eb025

• Merge pull request ember-engines#434 from buschtoens/asset-objects

  Show description for e892284
  rwjblue

  authored
  e892284

• v0.5.7

  rwjblue

  committed
  ed929cc

• Merge pull request ember-engines#425 from status200/lazyloading-routes

  Show description for a94cdac
  trentmwillis

  authored
  a94cdac

• v0.5.8

  rwjblue

  committed
  dd2b0f8

Commits on Jul 5, 2017

• fix merge conflict

  devotox

  committed
  11ce64c

Commits on Jul 7, 2017

• update fastboot manifest hook to use enabled key

  devotox

  committed
  71dc5a2

• remove package lock

  devotox

  committed
  55873dd