Merge branch 'master' into clostridium

* master:
  ember 2 series
  Remove globals initializer

app/pods/application/adapter.js

@@ -1,9 +1,13 @@
 import DS from 'ember-data';
 import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
+import Ember from 'ember';
 
+const { inject: { service } } = Ember;
 const { RESTAdapter } = DS;
 
 export default RESTAdapter.extend(DataAdapterMixin, {
+  globals: service(),
+
   authorizer: 'authorizer:application',
 
   namespace: function() {

app/pods/components/genus-name/component.js

@@ -1,8 +1,14 @@
 import Ember from 'ember';
 
-export default Ember.Component.extend({
+const { Component, computed, inject: { service } } = Ember;
+
+export default Component.extend({
+  globals: service(),
+
   tagName: 'em',
-  genus: function() {
+
+  genus: computed('globals.genus', function() {
     return this.get('globals.genus').capitalize();
-  }.property().readOnly(),
+  }),
+
 });

app/pods/components/site-logo/component.js

@@ -1,3 +1,7 @@
 import Ember from 'ember';
 
-export default Ember.Component.extend({});
+const { Component, inject: { service } } = Ember;
+
+export default Component.extend({
+  globals: service(),
+});

app/pods/protected/compare/results/results-table/component.js

@@ -4,6 +4,7 @@ const { Component, computed, inject: { service } } = Ember;
 
 export default Component.extend({
   session: service(),
+  globals: service(),
 
   strains: null,
   characteristics: null,