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.

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

This is just a bandaid PR so the main PR only reflects changes made during week 2. #21

Merged

Conversation

jnf
Copy link

@jnf jnf commented Aug 13, 2015

No description provided.

wangg131 and others added 30 commits August 5, 2015 10:56
sallyamoore and others added 24 commits August 7, 2015 12:00
can now add a user to twitter people followed.
…ate people, use ugly but cool polymorphic path to kill people.
… response, but response isn't formatted correctly yet.
Instagram feed - can retrieve feed information to display
Revised feeds_controller to deal with merge conflict
…stagram has_many InstagramPosts. User has_many InstagramPosts through Instagram.
… requests by media id and updated path for HTTParty in instagrams controller so that it would work with the updated INSTAGRAM_URI. Revised method for showing feed for instagram posts in feeds controller.
…gram post_id in db. The post_id is used to retrieve instagram data for each post in the db, then display it.
@jnf
Copy link
Author

jnf commented Aug 13, 2015

See #10 for original discussion and review.

jnf added a commit that referenced this pull request Aug 13, 2015
This is just a bandaid PR so the main PR only reflects changes made during week 2.
@jnf jnf merged commit b95e735 into Ada-Developers-Academy:ninjaparty/master Aug 13, 2015
@jnf jnf deleted the jnf/ninjaparty/master branch August 13, 2015 21:12
catchingash pushed a commit that referenced this pull request Feb 25, 2016
…lkers

Adds indices to grams + tweets  tables
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.

5 participants