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: jruby/jruby
base: d4b4a2694a43
Choose a base ref
...
head repository: jruby/jruby
compare: 25e14ae4dcde
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on May 26, 2015

  1. Squashed 'spec/mspec/' changes from 2045fe1..c73601b 

    c73601b Add a be_true_or_false matcher.
658a1bb Remove dependency on FileUtils in MSpec.
69e72e2 Let mspec know about the conflict between the SpinnerFormatter and MRI 2.0.
539b558 Report an error when passing a non-existing file to MSpec.
28f312a Refactor MSpecScript#entries.
59ffce4 Differentiate an attempt to load a config file from a request (with -B).

git-subtree-dir: spec/mspec
git-subtree-split: c73601bb55aa17da2c9112e9dd5f0bfc2e3b5e79
    @eregon
    eregon committed May 26, 2015
    Configuration menu
    Copy the full SHA
    ab00344 View commit details
    Browse the repository at this point in the history

  2. Merge commit 'ab00344b85b9a1601c932cc26236d3be37102050'

    @eregon
    eregon committed May 26, 2015
    Configuration menu
    Copy the full SHA
    25e14ae View commit details
    Browse the repository at this point in the history