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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve merge conflicts with martingri's pull request #18

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Resolve merge conflicts with martingri's pull request #18

wants to merge 4 commits into from

Commits on Jan 7, 2015

  1. Added l as a valid localization function name, to support the I18N pl… 

    …ugin for Mojolicious.
    @bk
    Martin Grimeland authored and bk committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    b4d8387 View commit details
    Browse the repository at this point in the history

  2. Replaced the function _ in the test with a variable alias to be able … 

    …to re-run the tests for multiple aliases. Added parameter $alias_terms to the run_test function to be able to specify which aliases to test for the plugin that is tested.
    @martingri @bk
    martingri authored and bk committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    e399719 View commit details
    Browse the repository at this point in the history

  3. Specify the number of expected tests instead of using done_testing

    @martingri @bk
    martingri authored and bk committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    4189f09 View commit details
    Browse the repository at this point in the history

  4. Correct test count after merging martingri's Mojolicious patches 

    See clintongormley#5
for details.
    @bk
    bk committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    29d445e View commit details
    Browse the repository at this point in the history