Skip to content

Commit

Permalink
Use node 0.10 safe Object.assign
Browse files Browse the repository at this point in the history
Closes #142
  • Loading branch information
jackboberg committed Aug 19, 2016
1 parent 108875f commit c01b62e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/controllers/uploader.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ var librarian = require('../common/api').librarian,
EventEmitter = require('events').EventEmitter,
util = require('util'),
request = require('request');
var _ = require('underscore');

//-----------------------------------------------------------------------------
/**
Expand Down Expand Up @@ -70,7 +71,7 @@ Uploader.prototype.upload = function (projectId, file, options) {
method: 'PUT',
uri: endpoint,
timeout: 60 * 60 * 1000, // 1 hour
qs: Object.assign({ authToken: apiKey }, options),
qs: _.extend({ authToken: apiKey }, options),
headers: { 'content-length': stat.size }
};

Expand Down

0 comments on commit c01b62e

Please sign in to comment.