Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Staging #19

Merged
merged 110 commits into from
Nov 24, 2019
Merged

Staging #19

merged 110 commits into from
Nov 24, 2019

Conversation

belzy
Copy link
Contributor

@belzy belzy commented Nov 24, 2019 •
edited
Loading

Description

Added endpoints for creating albums.

Type of change

  • New feature (non-breaking change which adds functionality)
  • This change requires a documentation update

Change Status

  • Complete, tested, ready to review and merge

How Has This Been Tested?

  • Integration tests for models and endpoints
  • Unit tests for validation module

Checklist

  • I have performed a self-review of my own code
  • My code has been reviewed by at least one peer
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • There are no merge conflicts

brandon-elzy and others added 30 commits November 7, 2019 18:29
Configured Sentry.io
31d99d6
@belzy
Merge pull request #8 from Lambda-School-Labs/configure-exception-mon…
7e5c637 
…itoring

Configured Sentry.io
Updated file structure
9e79da1
Merge branch 'staging' of https://github.com/Lambda-School-Labs/trave…
b000b7b 
…l-mapping-be into staging
Updated file structure
edee643
Added an integration test for /users
a837d95
Updated controllers
e61bcfc
Updated models export file
4d80d40
Added tests for users endpoint
c4f9b46
Updated travis ci env vars
3ebec32
Update
e31842c
Updated docs for /users/register and updated tests
0ef7c5a
Merge branch 'account-creation' of https://github.com/Lambda-School-L…
7a05d51 
…abs/travel-mapping-be into account-creation
Updated /users/register docs and added tests
640a7b4
Created tests for createUser model
a4c63d6
Added tests for user models
b9f9b4b
Updated models tests
5a5836c
Updated /users/register, updated docs, and added tests
81e20da
Added createUser and retrieveUserBy models and added tests
7f98e3c
Added password hashing
08931f8
Updated retrieveUserBy model
5eda0bc
Added JWT to /users/register
6d504b1
Updated app.json with jwt key for review apps
90a70f2
Updated .travis.yml with jwt key for testing
c14ca79
Test
ebff5b2
Test
7fc325a
Test
a452939
Added error handler for user routes
0067fd6
Added error handler for user routes
3a9ad9c
Updated .travis.yml
e19cde5
brandon-elzy and others added 21 commits November 13, 2019 22:48
Testing cors
31fde20
Testing cors
420d8c1
Testing cors
0e25fd9
Configured CORS for all environments
51cdbfc
Configured CORS for all environments
1fde2a0
Configured CORS for all environments
169bc6f
Configured CORS for all environments
e770159
@belzy
Merge pull request #17 from Lambda-School-Labs/account-creation
83a1c15 
Account creation
Updated API docs
cb14986
@belzy
Merge branch 'staging' into album-creation
6db037c
Updated API docs
b47d510
Merge branch 'staging' of https://github.com/Lambda-School-Labs/trave…
9f7aef3 
…l-mapping-be into album-creation
Updated API docs
4f3916a
Merge branch 'album-creation' of https://github.com/Lambda-School-Lab…
d5269c1 
…s/travel-mapping-be into album-creation
Refactored controllers
36ad8c1
Created createAlbum model and added tests
97525c2
Created add meta data endpoint
01bf63f
Added tests for add meta endpoint
87604b8
Added endpoint for editing an album and added tests
f51619b
Created remove album endpoint and added tests
4ff45d5
@belzy
Merge pull request #18 from Lambda-School-Labs/album-creation
d6142e0 
Album creation
@belzy belzy marked this pull request as ready for review November 24, 2019 01:32
adrianadames
adrianadames approved these changes Nov 24, 2019
View reviewed changes
Copy link
Collaborator

@adrianadames adrianadames left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving this PR so we can transition over to the new workflow where we don't have a github staging branch.

@belzy belzy merged commit 7c5186e into master Nov 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Brodt7258 Brodt7258 Brodt7258 approved these changes

@adrianadames adrianadames adrianadames approved these changes

@MorganPeterson1313 MorganPeterson1313 Awaiting requested review from MorganPeterson1313

@arturolei arturolei Awaiting requested review from arturolei

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@belzy @Brodt7258 @adrianadames @MorganPeterson1313