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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Merge 2.2 #1850

Merged
merged 5 commits into from
Apr 12, 2018
Merged

Merge 2.2 #1850

merged 5 commits into from
Apr 12, 2018

Commits on Apr 9, 2018

  1. Implement ability to define the controller for a subresource

    @jeffreymb
    jeffreymb committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    0b14455 View commit details
    Browse the repository at this point in the history

  2. A couple fixes so existing tests pass

    @jeffreymb
    jeffreymb committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    3b9f1d1 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2018

  1. Add test on subresource controller

    abluchet committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    b514300 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1830 from jeffreymb/issue_1828 

    Implement ability to define the controller for a subresource
    @sroze
    sroze committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    d34fba5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 2.2

    @sroze
    sroze committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    d611aa0 View commit details
    Browse the repository at this point in the history