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: rspec/rspec-rails
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ae4e485
Choose a base ref
...
head repository: rspec/rspec-rails
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dc431f4
Choose a head ref
  • 14 commits
  • 13 files changed
  • 5 contributors

Commits on Jun 5, 2016

  1. Revert version to 3.5.0.pre

    @myronmarston
    myronmarston committed Jun 5, 2016
    Configuration menu
    Copy the full SHA
    1ba60db View commit details
    Browse the repository at this point in the history

  2. Updated travis build scripts (from rspec-dev) (#1632)

    @myronmarston @JonRowe
    myronmarston authored and JonRowe committed Jun 5, 2016
    Configuration menu
    Copy the full SHA
    b019fdd View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2016

  1. Reorganise matchers (#1635) 

    * segreate generally usable matchers from rails context specific matchers

* include general matchers in all contexts when rspec-rails is present
    @JonRowe
    JonRowe authored Jun 14, 2016
    Configuration menu
    Copy the full SHA
    2c33b73 View commit details
    Browse the repository at this point in the history

  2. Revert "Reorganise matchers" (#1637)

    @JonRowe
    JonRowe authored Jun 14, 2016
    Configuration menu
    Copy the full SHA
    dd6334e View commit details
    Browse the repository at this point in the history

  3. in the case active_record has been improperly defined skip this callb… 

    …ack (#1636)
    @JonRowe
    JonRowe authored Jun 14, 2016
    Configuration menu
    Copy the full SHA
    1fad322 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2016

  1. Updated travis build scripts (from rspec-dev) (#1639)

    @myronmarston @JonRowe
    myronmarston authored and JonRowe committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    acca723 View commit details
    Browse the repository at this point in the history

  2. Fix typo in changelog [ci skip]

    @aried3r
    aried3r committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    e763506 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1640 from aried3r/patch-1 

    Fix typo in changelog
    @myronmarston
    myronmarston authored Jun 15, 2016
    Configuration menu
    Copy the full SHA
    5b58d26 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2016

  1. include general matchers in all contexts when rspec-rails is present (#… 

    …1638)
    @JonRowe
    JonRowe authored Jun 17, 2016
    Configuration menu
    Copy the full SHA
    5612e0d View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2016

  1. Fix the indentation of scaffold controller spec (#1647)

    @ash1day @JonRowe
    ash1day authored and JonRowe committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    1b2ae29 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2016

  1. Test against rails 5 proper (#1648)

    @JonRowe
    Sam Phippen authored and JonRowe committed Jul 1, 2016
    2 Configuration menu
    Copy the full SHA
    867448c View commit details
    Browse the repository at this point in the history

  2. Bump version to 3.5.0

    Sam Phippen committed Jul 1, 2016
    3 Configuration menu
    Copy the full SHA
    e5eb751 View commit details
    Browse the repository at this point in the history

  3. Add changelog entry for v3.5.0

    Sam Phippen committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    e898e50 View commit details
    Browse the repository at this point in the history

  4. Fixup changelog for 3.5.0

    Sam Phippen committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    dc431f4 View commit details
    Browse the repository at this point in the history
Loading