Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@

var EOL = require('os').EOL;
var multiline = require('multiline');
var Promise = require('ember-cli/lib/ext/promise');
var RSVP = require('rsvp');
var GitHubApi = require('github');

var github = new GitHubApi({version: '3.0.0'});
var compareCommits = Promise.denodeify(github.repos.compareCommits);
var compareCommits = RSVP.denodeify(github.repos.compareCommits);
var currentVersion = 'v' + require('../package').version;

var user = 'ember-cli-deploy';
Expand Down
6 changes: 3 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* jshint node: true */
'use strict';

var Promise = require('ember-cli/lib/ext/promise');
var RSVP = require('rsvp');
var glob = require('glob');
var DeployPluginBase = require('ember-cli-deploy-plugin');
var path = require('path');
Expand Down Expand Up @@ -46,7 +46,7 @@ module.exports = {
})
.catch(function(error) {
self.log('build failed', { color: 'red' });
return Promise.reject(error);
return RSVP.reject(error);
});
},
_logSuccess: function(outputPath) {
Expand All @@ -60,7 +60,7 @@ module.exports = {
}
self.log('build ok', { verbose: true });

return Promise.resolve(files);
return RSVP.resolve(files);
}
});
return new DeployPlugin();
Expand Down
2 changes: 0 additions & 2 deletions tests/unit/index-nodetest.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/*jshint globalstrict: true*/
'use strict';

var RSVP = require('ember-cli/lib/ext/promise');

var assert = require('ember-cli/tests/helpers/assert');

describe('build plugin', function() {
Expand Down