Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reserved branch warning #82

Merged
merged 13 commits into from
May 17, 2016
Merged

Reserved branch warning #82

merged 13 commits into from
May 17, 2016

Commits on May 16, 2016

  1. Configuration menu
    Copy the full SHA
    7bbb374 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f565a3c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    751400a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    94e14e9 View commit details
    Browse the repository at this point in the history
  5. add Ruby version 2.2.4

    mykola42 committed May 16, 2016
    Configuration menu
    Copy the full SHA
    6efea7c View commit details
    Browse the repository at this point in the history
  6. fix a typo

    mykola42 committed May 16, 2016
    Configuration menu
    Copy the full SHA
    c0b21ac View commit details
    Browse the repository at this point in the history
  7. Fixing bugs.

    Brian Bergstrom committed May 16, 2016
    Configuration menu
    Copy the full SHA
    0584e0a View commit details
    Browse the repository at this point in the history
  8. Merge branch 'reserved-branch-warning' of github.com:sportngin/octopo…

    …lo into reserved-branch-warning
    Brian Bergstrom committed May 16, 2016
    Configuration menu
    Copy the full SHA
    c0274f7 View commit details
    Browse the repository at this point in the history
  9. Fix existing tests.

    Brian Bergstrom committed May 16, 2016
    Configuration menu
    Copy the full SHA
    dce165a View commit details
    Browse the repository at this point in the history
  10. Fix existing tests.

    Brian Bergstrom committed May 16, 2016
    Configuration menu
    Copy the full SHA
    34f97fc View commit details
    Browse the repository at this point in the history
  11. Almost have new tests working. One stub is being stubborn.

    Brian Bergstrom committed May 16, 2016
    Configuration menu
    Copy the full SHA
    56b50a9 View commit details
    Browse the repository at this point in the history
  12. Fixing the new tests.

    Brian Bergstrom committed May 16, 2016
    Configuration menu
    Copy the full SHA
    7f4363b View commit details
    Browse the repository at this point in the history

Commits on May 17, 2016

  1. Merge remote-tracking branch 'origin/master' into reserved-branch-war…

    …ning
    
    Conflicts:
    	lib/octopolo/git.rb
    Brian Bergstrom committed May 17, 2016
    Configuration menu
    Copy the full SHA
    a0d16eb View commit details
    Browse the repository at this point in the history