Port updates from master #1043
Merged
Port updates from master #1043
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On default package.json, heroku deployment fails. Just updating mongoose/connect-mongo package solves the issue for Heroku deployment.
chore(npm): Update mongoose & connect-mongo to latest
Fix Grunfile.js ngAnnotate task src from `*/**.js` to `**/*.js`
fix(grunt): Fix ngAnnotate src blob
kingcody
force-pushed
the
chore/port-fixes-from-master
branch
from
c33f4d2 to
93c295c
Compare
kingcody
force-pushed
the
chore/port-fixes-from-master
branch
from
a3c5b81 to
2233ee9
Compare
|
93c295c fixes any merge conflicts (canary merges cleanly into master). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.