merge issues
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
added user validation and required fields
added user validation and required fields
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
started wanting feature tests
Merge branch 'WantButton' of github.com:StephanMusgrave/ProjectX
added line break to listing index
refresh issue now sorted
Merge branch 'master' of https://github.com/StephanMusgrave/ProjectX into HEAD
Added new test feature for user profile page
Fixed merge for user model
committing to merge
Updating user profile page branch
join table
merge conflicts
gem newrelic_rpm added to Gemfile
newrelic.yml added to config
fixed adding listings feature. now takes you to the listing page after adding, test passes
Merge branch 'master' of github.com:StephanMusgrave/ProjectX