forked from AdaGold/ride-share-rails
-
Notifications
You must be signed in to change notification settings - Fork 26
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
Ports - Elle and Cloudy #23
Open
dev-elle-up
wants to merge
35
commits into
Ada-C11:master
Choose a base branch
from
dev-elle-up:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
…ver, Passenger, Trip. Added foreign keys to Trip. Got databases working and seeded locally.
…man and belongs_to properties in the models
…rivate passenger_params method. Added validation to passenger model - require name and phone num.
…. Also fixed a tiny bug (shh) in passenger model. (Don't tell.)
…on. Integrated links between pages. Started pseudo-coding a home page.
…t, earned, and avg rating.
…esolve a merge conflict with Cloudy's styling branch. This brings the elle branch up to date with the cloudy branch. Next task will be to merge into master.
Merging the changes Cloudy did on the cloudy branch, which I merged by mistake into the elle branch by doing a git pull while on that branch. Oops. Fixing everything.
Merging the elle branch into master after finishing writing tests.
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.
Rideshare-Rails
Congratulations! You're submitting your assignment! These comprehension questions should be answered by both partners together, not by a single teammate.
Comprehension Questions