[koha-commits] main Koha release repository branch 16.05.x updated. v16.05.13-4-gafa60a8

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 16.05.x has been updated
       via  afa60a8df525cc17fc1f8ab0cf49c6b495ad8e38 (commit)
       via  a8c227c7367ac011409ea4ce2fd425a38ce6f902 (commit)
       via  76db315669b1d49e204545fa2d255cacfaee1b0b (commit)
       via  5e8ea082e6708226f7aae6ad4df6e14a6ee2bc99 (commit)
      from  367380e96afaa608430394013e6dc820c1960391 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit afa60a8df525cc17fc1f8ab0cf49c6b495ad8e38
Author: Mason James <mtj at kohaaloha.com>
Date:   Tue Jun 13 17:13:45 2017 +1200

    Increment version for 16.05.14 release

commit a8c227c7367ac011409ea4ce2fd425a38ce6f902
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jun 9 18:52:17 2017 -0400

    Bug 18773: Fix failing history.t test
    
    changed get() to get_ok() and increased test count to match.
    Now the master build will only fail on search_utf8.t
    
    TEST PLAN
    ---------
    assuming KOHA_CONF is set.
    $ export KOHA_INTRANET_URL=...
    $ export KOHA_OPAC_URL=...
    $ prove -v t/db_dependent/www/history.t
    
    run koha qa test tools
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Works correctly using text plan provided and passes QA tools.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 76db315669b1d49e204545fa2d255cacfaee1b0b
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jun 9 19:23:49 2017 -0400

    Bug 18411: Fix failing search_utf8.t tests
    
    TEST PLAN
    ---------
    export KOHA_INTRANET_URL=...
    prove -v t/db_dependent/www/search_utf8.t
    
    something like seen before failure:
    t/db_dependent/www/search_utf8.t .. 9/66 Error GETing http://koha_16_11:8080/cgi-bin/koha/tools/background-job-progress.pl?jobID=741d649f9d4472fe75f30761ba2488c0: Bad Request at t/db_dependent/www/search_utf8.t line 170.
    
    apply this patch
    prove -v t/db_dependent/www/search_utf8.t
    
    Now it is the marc staging that is failing.
    And that is failing in master for me.
    So, I don't think it is the test that is a problem at this point,
    but the actual staged marc records process.
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    I'm not sure why you had problems. All 66 tests passed
    after patch application and the patch also passes QA Tools.
    I tested this patch on a brand new kohadevbox without issue.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5e8ea082e6708226f7aae6ad4df6e14a6ee2bc99
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jun 6 16:41:37 2017 -0300

    Bug 18740: (bug 16992 follow-up) Add CSRF token to the template
    
    Bug 16992 is in
      commit 9e74db7b51085f62919e34ab4e5ccdf9da2066a1
        Bug 18124: Restrict CSRF token to user's session
    
    but template change is missing
    
    Test plan:
    Modify a patron from member-password.pl
    Without this patch you got
      Wrong CSRF token at /home/vagrant/kohaclone/members/member-password.pl line 68.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Patch fixes the bug. Passes the qa script.
    Signed-off-by: Mason James <mtj at kohaaloha.com>

-----------------------------------------------------------------------

Summary of changes:
 Koha.pm                                                          |    2 +-
 installer/data/mysql/updatedatabase.pl                           |    6 ++++++
 .../intranet-tmpl/prog/en/modules/members/member-password.tt     |    6 +++++-
 t/db_dependent/www/history.t                                     |    6 +++---
 t/db_dependent/www/search_utf8.t                                 |    5 ++---
 5 files changed, 17 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository