summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastiaan <se-bastiaan@users.noreply.github.com>2015-02-28 15:46:03 +0100
committerSébastiaan <se-bastiaan@users.noreply.github.com>2015-02-28 15:46:03 +0100
commit9a72f2467ea8ace1892bfe6e95d0a117d3933ac4 (patch)
tree52ecbedf263eb568e2a54473bf6c6aaa66bb2008
parentda7b4f2759d488fd0312669fe4ab4854de7d89f3 (diff)
downloadpopcorn-api-origin/revert-23-master.zip
popcorn-api-origin/revert-23-master.tar.gz
popcorn-api-origin/revert-23-master.tar.bz2
Revert "Added CORS on the server"origin/revert-23-master
-rwxr-xr-x[-rw-r--r--]package.json1
-rw-r--r--setup.js4
2 files changed, 1 insertions, 4 deletions
diff --git a/package.json b/package.json
index 5ec3fa2..2a795dc 100644..100755
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
"body-parser": "^1.2.0",
"cheerio": "^0.16.0",
"compression": "^1.0.2",
- "cors": "^2.5.3",
"cron": "^1.0.4",
"express": "^4.3.0",
"moment": "^2.6.0",
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());
}