Skip to content

Commit

Permalink
Revert "fix: remove duplicate import and no relative import (#4015)"
Browse files Browse the repository at this point in the history
This reverts commit 3ce9b50.
  • Loading branch information
iamareebjamal authored Feb 15, 2020
1 parent 3ce9b50 commit 7792a82
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 19 deletions.
2 changes: 1 addition & 1 deletion app/initializers/extensions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'open-event-frontend/extensions/ember-table/component';
import '../extensions/ember-table/component';

export function initialize() {}

Expand Down
3 changes: 2 additions & 1 deletion app/services/current-user.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Service, { inject as service } from '@ember/service';
import Service from '@ember/service';
import { inject as service } from '@ember/service';
import { isEmpty } from '@ember/utils';
import { resolve } from 'rsvp';

Expand Down
3 changes: 2 additions & 1 deletion app/services/device.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import $ from 'jquery';
import Service, { inject as service } from '@ember/service';
import Service from '@ember/service';
import { computed } from '@ember/object';
import { equal, or } from '@ember/object/computed';
import { debounce } from '@ember/runloop';
import { forOwn } from 'lodash-es';
import { inject as service } from '@ember/service';

/**
* Keeping this outside the service object to keep it lean and faster to loop over
Expand Down
14 changes: 0 additions & 14 deletions tests/app.js

This file was deleted.

4 changes: 2 additions & 2 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Application from './app';
import Application from '../app';
import QUnit from 'qunit';
import config from 'open-event-frontend/config/environment';
import config from '../config/environment';
import { setApplication } from '@ember/test-helpers';
import { start } from 'ember-qunit';
import loadEmberExam from 'ember-exam/test-support/load';
Expand Down

0 comments on commit 7792a82

Please sign in to comment.