/bokkun

Repository for Bokkun

Primary LanguageRuby

Bokkun

Expenses Management Platform

Development Guidelines

NOTICE!

  • I changed our main branch name to dev rather than using the usual development because it will be easier for everyone to write.
  • Then again, please read everything inside this README.md

Very-very Important!

  • master branch will be used for releases to heroku only.
  • Therefore: DO NOT MERGE TO master DIRECTLY

Still important!

  • Make a pull request everytime you're done with your branch(es)!
  • This repo is integrated to our slack channel so the updates will be there too!

For everytime dev has an update!

  • git fetch --all to get the latest updates from origin (GitHub)
  • Then after fetch, please update your branch with git merge origin/dev inside your working branch
  • Please keep your-working-branch updated with the latest dev branch to avoid conflicts
  • Conflicts will be a total headaches to work on so please don't forget to git merge origin/dev to your-working-branch

Do-not-forget!

  • Please checkout to dev since we're going to pool everything there first
  • Create a new branch for each features, please
  • dev-[action]-[feature] as a branch name, with everything in lower case.
  • Don't forget to make a Pull Request for each features you're working on
  • Change the tag both in our Trello and your ongoing Pull Requests
  • Optional : Ask someone to review your newly-done function by adding them as the reviewer

Running on your local

  • Checkout to dev and then run git fetch --all and git pull
  • Run bundle install and yarn install to make sure any newly added gems/packages are present
  • Run rails db:create db:migrate to get the migration running up to the latest version
  • run rails db:seed to get the db ready with seeds
  • Run rails s to get the server up locally

Credits

Rails app generated with lewagon/rails-templates, created by the Le Wagon coding bootcamp team.