From 289a757401fac60c819cabf66e6d0ec9e413bb2d Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sun, 3 May 2015 16:55:25 -0700 Subject: [PATCH] fix moment and update .gitignore --- .gitignore | 2 +- controllers/story.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9071ad3fb8..13d2705bed 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,4 @@ Thumbs.db bower_components .eslintignore .eslintrc -public/css/main.css +main.css diff --git a/controllers/story.js b/controllers/story.js index 9770806f2e..c41998bd7e 100755 --- a/controllers/story.js +++ b/controllers/story.js @@ -4,7 +4,7 @@ var R = require('ramda'), Story = require('./../models/Story'), Comment = require('./../models/Comment'), User = require('./../models/User'), - moment = require('../public/js/lib/moment/moment.js'), + moment = require('moment'), resources = require('./resources'), mongodb = require('mongodb'), MongoClient = mongodb.MongoClient, diff --git a/package.json b/package.json index da683761f2..5f5efc4484 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "lodash": "^2.4.1", "lusca": "^1.0.2", "method-override": "^2.3.0", - "moment": "^2.8.4", + "moment": "^2.10.2", "mongodb": "^1.4.33", "mongoose": "^4.0.1", "mongoose-long": "0.0.2",