{"push_id":602602091,"size":7,"distinct_size":1,"ref":"refs/heads/np_expand_rack_cors_setting","head":"ee0878c428ccd4fef255ef1633527c6bbf2d8c45","before":"88a1c4cab961d199e434b0760031cc96888f9255","commits":[{"sha":"29b869aed8787ca0d04d1b02839753d2aac3739d","author":{"email":"0fef6102c23862c6890d65ce2c5c84a0c4d985ca@gmail.com","name":"idelairre"},"message":"fixes a typo in the charges controller. allows the amounts passed through by the front end to be charged.","distinct":false,"url":"https://api.github.com/repos/BagelsByBob/bobs-bagels-api/commits/29b869aed8787ca0d04d1b02839753d2aac3739d"},{"sha":"20202fc3b932dd52f9a6501965e4b18c31211ef5","author":{"email":"0fef6102c23862c6890d65ce2c5c84a0c4d985ca@gmail.com","name":"idelairre"},"message":"changes charge to take cart json instead of amount. Added some controller logic which will later be moved to the model to total the cart.","distinct":false,"url":"https://api.github.com/repos/BagelsByBob/bobs-bagels-api/commits/20202fc3b932dd52f9a6501965e4b18c31211ef5"},{"sha":"71c1904afcc85affb61624cb85d6ef57a8a5cb17","author":{"email":"0fef6102c23862c6890d65ce2c5c84a0c4d985ca@gmail.com","name":"idelairre"},"message":"merged from master and resolved conflict.","distinct":false,"url":"https://api.github.com/repos/BagelsByBob/bobs-bagels-api/commits/71c1904afcc85affb61624cb85d6ef57a8a5cb17"},{"sha":"bff172b5a9e70f6b4a8aef5d48a919d7a5b5e6bf","author":{"email":"0fef6102c23862c6890d65ce2c5c84a0c4d985ca@gmail.com","name":"idelairre"},"message":"moves logic to calculate total to the charge model.","distinct":false,"url":"https://api.github.com/repos/BagelsByBob/bobs-bagels-api/commits/bff172b5a9e70f6b4a8aef5d48a919d7a5b5e6bf"},{"sha":"216472fe7367fc8dcc257e0419687523fc12ac67","author":{"email":"0fef6102c23862c6890d65ce2c5c84a0c4d985ca@gmail.com","name":"idelairre"},"message":"merges recent changes from master and resolves merge conflicts.","distinct":false,"url":"https://api.github.com/repos/BagelsByBob/bobs-bagels-api/commits/216472fe7367fc8dcc257e0419687523fc12ac67"},{"sha":"a94f90949084cec652580c1a7fb6ed9dc2a766f4","author":{"email":"5f563b11293e190b92a5efd0c9fc7abe47ae6cf6@gmail.com","name":"Nicole Pupillo"},"message":"Merge pull request #43 from BagelsByBob/id_stripe\n\nmoves business logic for calculating total cost to charges model.","distinct":false,"url":"https://api.github.com/repos/BagelsByBob/bobs-bagels-api/commits/a94f90949084cec652580c1a7fb6ed9dc2a766f4"},{"sha":"ee0878c428ccd4fef255ef1633527c6bbf2d8c45","author":{"email":"5f563b11293e190b92a5efd0c9fc7abe47ae6cf6@gmail.com","name":"Nicole Pupillo"},"message":"Merge branch 'master' into np_expand_rack_cors_setting","distinct":true,"url":"https://api.github.com/repos/BagelsByBob/bobs-bagels-api/commits/ee0878c428ccd4fef255ef1633527c6bbf2d8c45"}]}