Skip to content
This repository was archived by the owner on Jul 21, 2024. It is now read-only.

Conversation

alexsydney
Copy link

No description provided.

ruralocity added 30 commits May 22, 2017 14:20
Conflicts:
  spec/models/user_spec.rb
    Use factory for test data in new spec
Conflicts:
  Gemfile.lock
    Keep factory_girl_rails; remove gravatar_image_tag
We run into issues with date comparisons when using the projects
factory, due to time zones. Use Date.current.in_time_zone to make sure
an appropriate timestamp gets created.
Conflicts:
  Gemfile.lock
    Keep new dependencies from both branches
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants