<!DOCTYPE html>
<html>
<head>
</head>
<body style='font: 12pt Roboto, "DejaVu Sans", Arial; margin-left: 5px; margin-right: 5px;'>
<div id="entry">
<h1 style='font: 12pt Roboto, "DejaVu Sans", Arial; display:block; background: #c0cf88; border-bottom: solid 3px #573; padding: 5px; margin-top: 0px; color: #573;'><a href="https://kallithea-scm.org/repos/kallithea/changeset/148360f533a45499fbedea972343916b55cb5474" style="text-decoration: none; font-weight: bold; color: #573;">Merge stable</a></h1>
<div id="body">
kiilerix committed on 2015-07-13 17:37:39<br />branch: default<br />changeset: <a href="https://kallithea-scm.org/repos/kallithea/changeset/148360f533a45499fbedea972343916b55cb5474">148360f5</a><pre>Merge stable
M .hgtags (1 lines added, 0 lines removed)
M docs/api/api.rst (3 lines added, 2 lines removed)
M kallithea/__init__.py (1 lines added, 1 lines removed)
M kallithea/controllers/admin/my_account.py (1 lines added, 1 lines removed)
M kallithea/controllers/admin/users.py (1 lines added, 1 lines removed)
M kallithea/controllers/api/api.py (14 lines added, 0 lines removed)
M kallithea/i18n/be/LC_MESSAGES/kallithea.po (3 lines added, 3 lines removed)
M kallithea/i18n/kallithea.pot (279 lines added, 285 lines removed)
M kallithea/lib/auth.py (22 lines added, 9 lines removed)
M kallithea/lib/dbmigrate/schema/db_1_2_0.py (1 lines added, 1 lines removed)
M kallithea/lib/helpers.py (3 lines added, 3 lines removed)
M kallithea/lib/utils2.py (6 lines added, 16 lines removed)
M kallithea/model/api_key.py (1 lines added, 1 lines removed)
M kallithea/model/db.py (29 lines added, 26 lines removed)
M kallithea/model/user.py (2 lines added, 2 lines removed)
M kallithea/model/user_group.py (1 lines added, 1 lines removed)
M kallithea/public/js/base.js (10 lines added, 4 lines removed)
M kallithea/templates/admin/permissions/permissions_globals.html (12 lines added, 8 lines removed)
M kallithea/templates/data_table/_dt_elements.html (1 lines added, 1 lines removed)
M kallithea/tests/api/api_base.py (80 lines added, 0 lines removed)
M kallithea/tests/functional/test_login.py (3 lines added, 1 lines removed)
M kallithea/tests/models/test_permissions.py (214 lines added, 0 lines removed)</pre>
</div>
</div>
</div>
</body>
</html>
<!DOCTYPE html>
<html>
<head>
</head>
<body style='font: 12pt Roboto, "DejaVu Sans", Arial; margin-left: 5px; margin-right: 5px;'>
<div id="entry">
<h1 style='font: 12pt Roboto, "DejaVu Sans", Arial; display:block; background: #c0cf88; border-bottom: solid 3px #573; padding: 5px; margin-top: 0px; color: #573;'><a href="https://kallithea-scm.org/repos/kallithea/changeset/f9367342412a92c29a6f4bb771d525645d986fc2" style="text-decoration: none; font-weight: bold; color: #573;">tests: hide database setup queries with pytest Unlike nosetest, pytest would show the database setup queries at the beginning of the test run, which don't b...</a></h1>
<div id="body">
patrickdp committed on 2015-07-02 10:07:19<br />branch: default<br />tag: tip<br />changeset: <a href="https://kallithea-scm.org/repos/kallithea/changeset/f9367342412a92c29a6f4bb771d525645d986fc2">f9367342</a><pre>tests: hide database setup queries with pytest
Unlike nosetest, pytest would show the database setup queries at the
beginning of the test run, which don't bring added value.
Hide them by disabling logging during this time.
Note that this does not provide an easy method of enabling the logging on
demand (what could be done with the -s switch in nosetest).
M kallithea/tests/conftest.py (5 lines added, 0 lines removed)</pre>
</div>
</div>
</div>
</body>
</html>