summaryrefslogtreecommitdiffstats
path: root/setup.js
diff options
context:
space:
mode:
authorSébastiaan <se-bastiaan@users.noreply.github.com>2015-02-28 15:47:03 +0100
committerSébastiaan <se-bastiaan@users.noreply.github.com>2015-02-28 15:47:03 +0100
commit238070cb8250e25173b3e64b00f9b208f51fd5c6 (patch)
tree52ecbedf263eb568e2a54473bf6c6aaa66bb2008 /setup.js
parentda7b4f2759d488fd0312669fe4ab4854de7d89f3 (diff)
parent9a72f2467ea8ace1892bfe6e95d0a117d3933ac4 (diff)
downloadpopcorn-api-origin/master.zip
popcorn-api-origin/master.tar.gz
popcorn-api-origin/master.tar.bz2
Merge pull request #24 from popcorn-official/revert-23-masterHEADorigin/masterorigin/HEADmaster
Revert "Added CORS on the server"
Diffstat (limited to 'setup.js')
-rw-r--r--setup.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/setup.js b/setup.js
index ccaf67d..864e932 100644
--- a/setup.js
+++ b/setup.js
@@ -2,8 +2,7 @@ var join = require('path').join
, express = require('express')
, compress = require('compression')
, responseTime = require('response-time')
- , bodyParser = require('body-parser')
- , cors = require('cors');
+ , bodyParser = require('body-parser');
var mongoose = require('mongoose');
var config = require('./config');
@@ -41,5 +40,4 @@ module.exports = function(config, app) {
memLevel: 3
}));
app.use(responseTime());
- app.use(cors());
}