Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: roguerb/pull-request-workshop
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ruby_code_of_conduct
Choose a base ref
...
head repository: roguerb/pull-request-workshop
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 3 files changed
  • 3 contributors

Commits on Jun 29, 2016

  1. Add rubocop instructions to README

    @conroywhitney
    conroywhitney committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    7761a61 View commit details
    Browse the repository at this point in the history

  2. Added square test, fixed other tests

    @mistertime
    mistertime committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    a6c019b View commit details
    Browse the repository at this point in the history

  3. No more random tests

    @mistertime
    mistertime committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    b30b510 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #20 from roguerb/ruby_code_of_conduct 

    Adding Code of Conduct based on Ruby's CoC
    @conroywhitney
    conroywhitney authored Jun 29, 2016
    Configuration menu
    Copy the full SHA
    824f7b6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #14 from roguerb/add_rubocop_instructions_to_readme 

    Add rubocop instructions to README
    @conroywhitney
    conroywhitney authored Jun 29, 2016
    Configuration menu
    Copy the full SHA
    5855a1b View commit details
    Browse the repository at this point in the history

  6. Fixed tests and math methods

    @mistertime
    mistertime committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    76f28af View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/roguerb/pull-request-work… 

    …shop into fix-tests

Conflicts:
	spec/rogue_math_spec.rb
    @mistertime
    mistertime committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    cc1fde1 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #23 from mistertime/fix-tests 

    Fix subtract and divide methods
    @conroywhitney
    conroywhitney authored Jun 29, 2016
    Configuration menu
    Copy the full SHA
    5ad1faa View commit details
    Browse the repository at this point in the history
Loading