Development Guidelines

Source Control

System: Git Hosted: GitHub at https://github.com/cyclestreets/

OS

Development: Ubuntu/Mac OS X Deployment: Ubuntu

Coding guidelines

Follow: https://github.com/bbatsov/ruby-style-guide

Versions

• Rails: 3.1
• Ruby: 1.9.2
• Git: 1.7
• PostgreSQL: 9.0

Git workflow

• The master branch should be stable, tested, and can be deployed at any time.
• Work should be done in feature branches with meaningful names.
• Very small changes and bug fixes can be made on the long-running bugfix branch.
• Merges between branches should almost always be non-fast-forward.
• Only pulls from remotes or where a branch needs to catch up with master should be fast-forwards.