Skip to content

Merge Collections to Master #1340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 248 commits into from
Mar 30, 2020
Merged

Merge Collections to Master #1340

merged 248 commits into from
Mar 30, 2020

Conversation

catarak
Copy link
Member

@catarak catarak commented Mar 24, 2020

I have verified that this pull request:

  • has no linting errors (npm run lint)
  • is from a uniquely-named feature branch and has been rebased on top of the latest master. (If I was asked to make more changes, I have made sure to rebase onto master then too)
  • is descriptively named and links to an issue number, i.e. Fixes #123

I thin this is finally ready?? I think for now I may keep the API features off until we have more testing... but collections are set!

Vertmo and others added 30 commits May 29, 2019 12:51
The tests mock the mogoose User model and the express Response model
which isn't good. We should find a solution that makes use of
the actual model object.
This ensures it's not accidentally exposed to the client when returning
the key metadata
This is until this page's components are made theme-aware
There's duplication in the user and session endpoints that
all return the same shaped user model data. The new helper should keep
them consistent when new properties need to be exposed.
* Run tests on CI

* Create a lint error on purpose

* Splits build into test and deploy stages

lint and test jobs will run in parallel and if both are successful
(and branch is master), deploy will run.

* Revert "Create a lint error on purpose"

This reverts commit 306c91c.

* Updating snapshot

* Run deploy only on master branch (not PRs)

* Use global deploy config item to avoid building on PRs
@andrewn
Copy link
Member

andrewn commented Mar 26, 2020

🎉

@catarak
Copy link
Member Author

catarak commented Mar 30, 2020

here goes nothing :) I can always undo it if there are any issues!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.