update merge from master
This commit is contained in:
commit
f295082592
88 changed files with 771 additions and 675 deletions
|
@ -26,7 +26,7 @@
|
|||
"node": false,
|
||||
"browser": false,
|
||||
"boss": true,
|
||||
"curly": false,
|
||||
"curly": true,
|
||||
"debug": false,
|
||||
"devel": false,
|
||||
"eqeqeq": true,
|
||||
|
@ -47,5 +47,6 @@
|
|||
"strict": false,
|
||||
"white": false,
|
||||
"eqnull": true,
|
||||
"esnext": true
|
||||
"esnext": true,
|
||||
"unused": true
|
||||
}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import Ember from 'ember';
|
||||
import Application from '../../app';
|
||||
import Router from '../../router';
|
||||
import config from '../../config/environment';
|
||||
|
||||
export default function startApp(attrs) {
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
import userCanAdd from '../../../utils/user-can-add';
|
||||
import { module, test } from 'qunit';
|
||||
|
||||
module('Unit | Utility | user can add');
|
||||
|
||||
// Replace this with your real tests.
|
||||
test('it works', function(assert) {
|
||||
var result = userCanAdd();
|
||||
assert.ok(result);
|
||||
});
|
|
@ -1,10 +0,0 @@
|
|||
import userCanEdit from '../../../utils/user-can-edit';
|
||||
import { module, test } from 'qunit';
|
||||
|
||||
module('Unit | Utility | user can edit');
|
||||
|
||||
// Replace this with your real tests.
|
||||
test('it works', function(assert) {
|
||||
var result = userCanEdit();
|
||||
assert.ok(result);
|
||||
});
|
Reference in a new issue