Skip to content
This repository has been archived by the owner on Nov 21, 2017. It is now read-only.

Latest commit

 

History

History
131 lines (91 loc) · 4.77 KB

CONTRIBUTING.md

File metadata and controls

131 lines (91 loc) · 4.77 KB
Raw

Contributing

This project follows the git flow branching model of product development.

Git Hooks

When working in the development environment, be sure to install the project specific git hooks.

 other/git-hooks/create-sym-links

Code Style

We adhere to the GitHub Ruby Style Guide for MyUSA.

Spaces should be used instead of tabs, and the tab width should be set to 2 spaces. No spaces at the end of lines.

Commit Messages

Treat commit messages as an email message that describes what you changed and why.

The first line of the commit log must be treated as as an email subject line. It must be strictly no greater than 50 characters long. The subject must stand on its own and not only make external references such as to relevant bug numbers.

The second line must be blank.

The third line begins the body of the commit message (one or more paragraphs) describing the details of the commit. Paragraphs are each separated by a blank line. Paragraphs must be word wrapped to be no longer than 76 characters.

The last part of the commit log should contain all "external references", such as which issues were fixed.

Submission Guidelines

Submitting an Issue

Before you submit your issue search the archive, maybe your question was already answered.

If your issue appears to be a bug, and hasn't been reported, open a new issue. Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues. Providing the following information will increase the chances of your issue being dealt with quickly:

  • Overview of the issue - if an error is being thrown a non-minified stack trace helps
  • Motivation for or Use Case - explain why this is a bug for you
  • MyUSA Version(s) - is it a regression?
  • Browsers and Operating System - is this a problem with all browsers or only IE8?
  • Reproduce the error - provide a live example, screenshot, and/or a unambiguous set of steps. The more the better.
  • Related issues - has a similar issue been reported before? Reference the related issues in the descrioption.
  • Suggest a Fix - if you can't fix the bug yourself, perhaps you can point to what might be causing the problem (line of code or commit). If you're requesting a feature, describe how the feature might work to resolve the user story.

Submitting a Pull Request

Before you submit your pull request consider the following guidelines:

  • Search GitHub for an open or closed Pull Request that relates to your submission. You don't want to duplicate effort.

  • Make your changes in a new git branch

    git checkout -b my-fix-branch devel

  • Create your patch, including appropriate test cases.

  • Follow our Code Style.

  • Run the full MyUSA test suite. When you're done developing something, make sure all the tests still pass by doing the following (from the Rails root):

    bundle exec rake spec

    If specific tests are failing and you want to save time and zero in on just those tests, do:

    bundle exec rspec spec/models/model_name.rb

  • Commit your changes using a descriptive commit message that follows our commit message conventions and passes our commit message presubmit hook pre-commit and commit-msg (see git hooks). Adherence to the commit message conventions is required to assist in generating release notes.

    git commit -a

    Note: the optional commit -a command line option will automatically "add" and "rm" edited files -- use at your own risk!

  • Push your branch to GitHub:

    git push origin my-fix-branch

  • In GitHub, send a pull request to myusa-server:devel.

  • If we suggest changes to the pull request after submitted, then:

    • Make the required updates.
    • Re-run the MyUSA test suite to ensure tests are still passing.

That's it! Thank you for your contribution!

After your pull request is merged

After your pull request is merged, you can safely delete your branch and pull the changes from the main (upstream) repository:

  • Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:

    git push origin --delete my-fix-branch

  • Check out the devel branch:

    git checkout devel -f

  • Delete the local branch:

    git branch -D my-fix-branch

  • Update your devel with the latest upstream version:

    git pull --ff upstream devel