Skip to content

Commit

Permalink
[Fastboot] Remove inject of cookies in initializer; Bump ember-cookie…
Browse files Browse the repository at this point in the history
…s; Add fastboot host whitelist (#1039)

* Add fastboot host whitelist

* Bump ember-cookies to make dummy app work

* Remove inject of cookies in initializers
  • Loading branch information
josemarluedke authored and marcoow committed Aug 1, 2016
1 parent 2d49133 commit ce29012
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 0 additions & 1 deletion addon/initializers/setup-session.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ export default function setupSession(registry) {
registry.register(store, Ephemeral);
}

inject(registry, store, 'cookies', 'service:cookies');
inject(registry, 'session:main', 'store', store);
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"dependencies": {
"ember-cli-babel": "^5.1.6",
"ember-cli-is-package-missing": "^1.0.0",
"ember-cookies": "0.0.7",
"ember-cookies": "0.0.9",
"ember-getowner-polyfill": "1.0.1",
"silent-error": "^1.0.0"
},
Expand Down
7 changes: 6 additions & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ module.exports = function(environment) {
}
},

apiHost: 'http://localhost:4200'
apiHost: 'http://localhost:4200',

fastboot: {
hostWhitelist:[/^localhost:\d+$/]
},

};

if (environment === 'development') {
Expand Down

0 comments on commit ce29012

Please sign in to comment.