Skip to content

This is a workaround so the primary pull request will reflect only the newest changes. - #20

Merged
jnf merged 105 commits into
Ada-Developers-Academy:beast/masterfrom
QuartzBrandi:jnf/beast/master
Aug 13, 2015
Merged

This is a workaround so the primary pull request will reflect only the newest changes.#20
jnf merged 105 commits into
Ada-Developers-Academy:beast/masterfrom
QuartzBrandi:jnf/beast/master

Conversation

@jnf

@jnf jnf commented Aug 13, 2015

Copy link
Copy Markdown

No description provided.

carjug and others added 30 commits August 5, 2015 13:51
Many things! Sessions controller tests yay
Association & validation tests
Session controller tests and some basic styling
Instagram authorization set up!
EliaMG and others added 25 commits August 9, 2015 13:55
RSPEC tests for post model validations and associations
…Bootstrap have a section with a textbox with a drop down button next to it if I can't use those dropdown buttons to submit the text...
…ethod to work. It's not the prettiest. Def needs some cleaning up, but the functionality is there. Also I commented out all things in the home controller because it was breaking everything forever. Additionally on the home index view I had to put in a conditional that would never be true for the feed display because that was all hinging on broken stuff in the home controller. Yay coding.
…ion to the home controller & added jumbotron to the index page when not logged on.
initial setup for using VCR as mock API call
@jnf

jnf commented Aug 13, 2015

Copy link
Copy Markdown
Author

See the original discussion in #13 for review and notes.

jnf added a commit that referenced this pull request Aug 13, 2015
This is a workaround so the primary pull request will reflect only the newest changes.
@jnf
jnf merged commit 395b5e4 into Ada-Developers-Academy:beast/master Aug 13, 2015
@jnf
jnf deleted the jnf/beast/master branch August 13, 2015 21:15
@jnf jnf mentioned this pull request Aug 13, 2015
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