Natasha & Allison #45
Open
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
…MarRails into b/nre+amh/master * 'b/nre+amh/master' of https://github.com/allisonhoke/FarMarRails: WIP created market method to find all vendors for a specific market added views for index and show actions created market controller. created index and show action methods
…te that I changed the welcome links.
…MarRails into b/nre+amh/master
…MarRails into b/nre+amh/master * 'b/nre+amh/master' of https://github.com/allisonhoke/FarMarRails: added button to see all vendors deleted market controller and created markets controller
…MarRails into b/nre+amh/master * 'b/nre+amh/master' of https://github.com/allisonhoke/FarMarRails: added missing commas added button to edit added edit action method created market edit html added update to routes that can be edited
…ok'd by nre+amh # Conflicts: # app/views/markets/edit.html.erb # app/views/markets/show.html.erb # app/views/products/edit.html.erb # app/views/products/index.html.erb # app/views/products/new.html.erb # app/views/vendors/index.html.erb
…MarRails into b/nre+amh/master
…MarRails into b/nre+amh/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.
https://serene-plateau-32625.herokuapp.com/markets