Merge pull request TryGhost#5 from cobbspur/zeldatests

Initial fixes for tests on Zelda branch
cobbspur · May 19, 2015 · d27514e · d27514e
2 parents 781b790 + 94fb26d
commit d27514e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/client/app/templates/settings/code-injection.hbs b/core/client/app/templates/settings/code-injection.hbs
@@ -15,13 +15,13 @@
             <div class="form-group">
                 <label for="ghost-head">Blog Header</label>
                 <p>Code here will be injected into the <code>\{{ghost_head}}</code> tag on every page of your blog</p>
-                {{gh-cm-editor id="ghost-head" class="gh-input" name="codeInjection[ghost_head]" class="settings-code-editor" type="text" value=model.ghost_head}}
+                {{gh-cm-editor id="ghost-head" class="gh-input settings-code-editor" name="codeInjection[ghost_head]" type="text" value=model.ghost_head}}
             </div>
 
             <div class="form-group">
                 <label for="ghost-foot">Blog Footer</label>
                 <p>Code here will be injected into the <code>\{{ghost_foot}}</code> tag on every page of your blog</p>
-                {{gh-cm-editor id="ghost-foot" class="gh-input" name="codeInjection[ghost_foot]" class="settings-code-editor" type="text" value=model.ghost_foot}}
+                {{gh-cm-editor id="ghost-foot" class="gh-input settings-code-editor" name="codeInjection[ghost_foot]" type="text" value=model.ghost_foot}}
             </div>
         </fieldset>
     </form>

diff --git a/core/client/app/views/settings/users/user.js b/core/client/app/views/settings/users/user.js
@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import BaseView from 'ghost/views/settings/content-base';
 
 var SettingsUserView = BaseView.extend({