Merge pull request #4051 from lukemelia/make-setup-initializer-public

Make setup-container public to allow consuming apps more flexibility with initializer
emberjs · Jan 9, 2016 · 65d1e76 · 65d1e76
2 parents 4db5365 + e3a3968
commit 65d1e76
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/addon/index.js b/addon/index.js
@@ -82,7 +82,7 @@ import {
 } from "ember-data/-private/transforms";
 
 import {hasMany, belongsTo} from "ember-data/relationships";
-import setupContainer from "ember-data/-private/setup-container";
+import setupContainer from "ember-data/setup-container";
 import initializeStoreService from 'ember-data/-private/instance-initializers/initialize-store-service';
 
 import ContainerProxy from "ember-data/-private/system/container-proxy";

diff --git a/addon/-private/setup-container.js → addon/setup-container.js b/addon/-private/setup-container.js → addon/setup-container.js
diff --git a/app/initializers/ember-data.js b/app/initializers/ember-data.js
@@ -1,4 +1,4 @@
-import setupContainer from 'ember-data/-private/setup-container';
+import setupContainer from 'ember-data/setup-container';
 import 'ember-data/-private/core';
 
 /*