Merge pull request #9311 from jayphelps/oops

[BUGFIX] Canary FEATURES flagging shouldn't produce warnings in canary
emberjs · Oct 14, 2014 · 2178406 · 2178406
2 parents bfff16b + 116434f
commit 2178406
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/features.json b/features.json
@@ -1,5 +1,6 @@
 {
   "features": {
+    "features-stripped-test": null,
     "ember-routing-named-substates": null,
     "ember-routing-add-model-option": true,
     "ember-routing-linkto-target-attribute": true,

diff --git a/packages/ember-debug/lib/main.js b/packages/ember-debug/lib/main.js
@@ -181,7 +181,7 @@ export function _warnIfUsingStrippedFeatureFlags(FEATURES, featuresWereStripped)
     Ember.warn('Ember.ENV.ENABLE_OPTIONAL_FEATURES is only available in canary builds.', !Ember.ENV.ENABLE_OPTIONAL_FEATURES);
 
     for (var key in FEATURES) {
-      if (FEATURES.hasOwnProperty(key)) {
+      if (FEATURES.hasOwnProperty(key) && key !== 'isEnabled') {
         Ember.warn('FEATURE["' + key + '"] is set as enabled, but FEATURE flags are only available in canary builds.', !FEATURES[key]);
       }
     }